Introduce the instance name (#44)

Author: hannesdejager

src/args.rs

@@ -16,6 +16,7 @@ pub const GCS_BUCKET: &str = "sbe-gcs-bucket";
 pub const GCS_KEY_FILE: &str = "sbe-gcs-key-file";
 pub const HTTP_BIND_ADDRESS: &str = "bind-address-http";
 pub const IDLE_SESSION_TIMEOUT: &str = "idle-session-timeout";
+pub const INSTANCE_NAME: &str = "instance-name";
 pub const PASSIVE_PORTS: &str = "passive-ports";
 pub const PROXY_EXTERNAL_CONTROL_PORT: &str = "proxy-external-control-port";
 pub const REDIS_HOST: &str = "log-redis-host";
@@ -126,6 +127,15 @@ pub(crate) fn clap_app(tmp_dir: &str) -> clap::App {
                 .takes_value(true)
                 .default_value("0.0.0.0:8080"),
         )
+        .arg(
+            Arg::with_name(INSTANCE_NAME)
+                .long("instance-name")
+                .value_name("NAME")
+                .help("Gives a user friendly name to this instance. This is for used for example as part of the app name during logging.")
+                .env("UNFTP_INSTANCE_NAME")
+                .takes_value(true)
+                .default_value("unFTP"),
+        )
         .arg(
             Arg::with_name(PASSIVE_PORTS)
                 .long("passive-ports")

src/main.rs

@@ -41,7 +41,13 @@ fn redis_logger(m: &clap::ArgMatches) -> Result<Option<redislog::Logger>, String
         m.value_of(args::REDIS_PORT),
     ) {
         (Some(key), Some(host), Some(port)) => {
-            let logger = redislog::Builder::new(app::NAME)
+            let instance_name = m.value_of(args::INSTANCE_NAME).unwrap();
+            let app_name = if instance_name == app::NAME {
+                String::from(app::NAME)
+            } else {
+                format!("{}-{}", app::NAME, instance_name)
+            };
+            let logger = redislog::Builder::new(&*app_name)
                 .redis(
                     String::from(host),
                     String::from(port).parse::<u32>().unwrap(),