Merge pull request #557 from input-output-hk/make-gelf-optional

mark gelf as optional feature

Author: vincenthz

jormungandr/Cargo.toml

@@ -25,6 +25,7 @@ serde_json = "1.0.38"
 serde_yaml = "0.8"
 slog = "^2.4"
 slog-async = "2.3.0"
+slog-gelf = { version = "0.1.0", optional = true }
 slog-journald = { version = "2.0.0", optional = true }
 slog-json = "2.3.0"
 slog-term = "2.4.0"
@@ -63,7 +64,6 @@ jormungandr-lib = { path = "../jormungandr-lib" }
 strfmt = "0.1"
 gtmpl = "0.5.6"
 mktemp = "0.4.0"
-slog-gelf = "0.1.0"
 
 [dependencies.actix-web]
 version = "0.7.18"
@@ -94,3 +94,4 @@ with-bench = []
 integration-test = []
 soak-test = []
 systemd = ["slog-journald"]
+gelf = ["slog-gelf"]

jormungandr/src/main.rs

@@ -45,6 +45,7 @@ extern crate serde_yaml;
 #[macro_use(b, o, record_static, debug, info, warn, error, crit)]
 extern crate slog;
 extern crate slog_async;
+#[cfg(feature = "gelf")]
 extern crate slog_gelf;
 #[cfg(feature = "systemd")]
 extern crate slog_journald;

jormungandr/src/settings/logging.rs

@@ -1,6 +1,7 @@
 use crate::log::{AsyncableDrain, JsonDrain};
 use slog::{Drain, Logger};
 use slog_async::Async;
+#[cfg(feature = "gelf")]
 use slog_gelf::Gelf;
 #[cfg(feature = "systemd")]
 use slog_journald::JournaldDrain;
@@ -31,6 +32,7 @@ pub enum LogFormat {
 /// Output of the logger.
 pub enum LogOutput {
     Stderr,
+    #[cfg(feature = "gelf")]
     Gelf,
     #[cfg(unix)]
     Syslog,
@@ -56,6 +58,7 @@ impl FromStr for LogOutput {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match &*s.trim().to_lowercase() {
             "stderr" => Ok(LogOutput::Stderr),
+            #[cfg(feature = "gelf")]
             "gelf" => Ok(LogOutput::Gelf),
             #[cfg(unix)]
             "syslog" => Ok(LogOutput::Syslog),
@@ -86,6 +89,7 @@ impl LogOutput {
     ) -> Result<Async, Error> {
         match self {
             LogOutput::Stderr => Ok(format.decorate_stderr()),
+            #[cfg(feature = "gelf")]
             LogOutput::Gelf => match backend {
                 Some(graylog_host_port) => {
                     match logs_id {