Skip to content

Commit

Permalink
Add raw output mode
Browse files Browse the repository at this point in the history
Users may want to use the Kubernetes reader to pull pod logs and
process the raw content elsewhere. This adds a new raw renderer
that outputs the original input.

Note that storing the original message content will increase memory
usage somewhat, though presumably not massively (expect less than 50
MiB per 100k messages).

See also, #42
  • Loading branch information
timothyb89 committed Oct 29, 2019
1 parent 3819a2c commit 31b212d
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use crate::renderer;
pub enum RendererType {
Auto,
Plain,
Raw,
Json,
Styled,
Interactive
Expand All @@ -49,6 +50,7 @@ impl RendererType {
match *self {
RendererType::Auto => get_auto_renderer(config),
RendererType::Plain => renderer::plain_renderer,
RendererType::Raw => renderer::raw_renderer,
RendererType::Json => renderer::json_renderer,
RendererType::Styled => renderer::styled_renderer,
RendererType::Interactive => renderer::interactive_renderer,
Expand All @@ -63,6 +65,7 @@ impl FromStr for RendererType {
match s {
"auto" => Ok(RendererType::Auto),
"plain" => Ok(RendererType::Plain),
"raw" => Ok(RendererType::Raw),
"json" => Ok(RendererType::Json),
"styled" => Ok(RendererType::Styled),
"interactive" => Ok(RendererType::Interactive),
Expand Down
4 changes: 3 additions & 1 deletion src/parser/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ pub fn get_timestamp(msg: &Map<String, Value>) -> Option<(&str, DateTime<Utc>)>
}

pub fn parse_document(
line: &str,
kind: MessageKind,
doc: Map<String, Value>,
meta: Option<ReaderMetadata>
Expand Down Expand Up @@ -143,6 +144,7 @@ pub fn parse_document(

let message = Message {
kind,
raw: line.to_string(),
reader_metadata: meta,
timestamp, level, text, metadata, mapped_fields
};
Expand All @@ -159,7 +161,7 @@ pub fn parse_json(
}

match serde_json::from_str(line) {
Ok(message) => parse_document(MessageKind::Json, message, meta),
Ok(message) => parse_document(line, MessageKind::Json, message, meta),
Err(_) => Ok(None)
}
}
1 change: 1 addition & 0 deletions src/parser/klog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ pub fn parse_klog(
return Ok(Some(Message {
kind: MessageKind::Klog,
reader_metadata: meta,
raw: line.to_string(),
text: Some(text.to_string()),

timestamp, level, metadata,
Expand Down
2 changes: 1 addition & 1 deletion src/parser/logrus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn parse_logrus(
if doc.is_empty() {
Ok(None)
} else {
parse_document(MessageKind::Logrus, doc, meta)
parse_document(line, MessageKind::Logrus, doc, meta)
}
},
Err(_) => Ok(None)
Expand Down
1 change: 1 addition & 0 deletions src/parser/plain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ pub fn parse_plain(
kind: MessageKind::Plain,
timestamp: get_meta_timestamp(&meta),
level: get_log_level(line),
raw: line.to_string(),
text: Some(String::from(line)),
metadata: HashMap::new(),
reader_metadata: meta,
Expand Down
1 change: 1 addition & 0 deletions src/parser/regex.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ fn parse_mapping(
let message = Message {
kind: MessageKind::Regex,
reader_metadata: meta.clone(),
raw: line.to_string(),
timestamp, level, text, metadata,
mapped_fields: HashMap::new()
};
Expand Down
3 changes: 3 additions & 0 deletions src/parser/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ pub struct Message {
#[serde(skip_serializing_if = "Option::is_none")]
pub level: Option<LogLevel>,

// The raw message content
pub raw: String,

/// The message text
#[serde(skip_serializing_if = "Option::is_none")]
pub text: Option<String>,
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ mod common;
mod json;
mod plain;
mod styled;
mod raw;
pub mod interactive;

pub use types::*;
pub use styled::styled_renderer;
pub use interactive::interactive_renderer;
pub use plain::plain_renderer;
pub use json::json_renderer;
pub use raw::raw_renderer;
22 changes: 22 additions & 0 deletions src/renderer/raw.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// (C) Copyright 2019 Hewlett Packard Enterprise Development LP

use std::sync::Arc;
use std::sync::mpsc::Receiver;
use std::thread::{self, JoinHandle};

use crate::config::Config;
use crate::renderer::types::*;

pub fn raw_renderer(_: Arc<Config>, rx: Receiver<LogEntry>) -> JoinHandle<()> {
thread::Builder::new().name("raw_renderer".to_string()).spawn(move || {
for entry in rx {
if entry.eof.is_some() {
break;
}

if let Some(message) = entry.message {
println!("{}", message.message.raw);
}
}
}).unwrap()
}
1 change: 1 addition & 0 deletions src/renderer/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ impl MessageEntry {
kind: MessageKind::Internal,
timestamp: Some(Utc::now()),
level: Some(LogLevel::Int),
raw: message.to_string(),
text: Some(message.to_string()),
metadata: HashMap::new(),
reader_metadata: None,
Expand Down

0 comments on commit 31b212d

Please sign in to comment.