adding ENV var config overrides

Author: Alex Levinson

TODO.md

@@ -28,7 +28,7 @@ This is cumbersome and should have a better way to do this.
 ## Explore an event pipeline
 I'm curious about how much "big data" we could collect in the game - trade transactions, attacks, kills, etc. Considering what to do on this front.
 
-## Move some configurations to ENV vars in the bot
+## [DONE] Move some configurations to ENV vars in the bot
 Right now, the bot uses `settings.ini` with a hardcoded username and password. We should be able to pass ENV vars instead making this cleaner.
 
 ## clean up CommandHandler code

firescape-bot/src/org/rscdaemon/bot/util/Config.java

@@ -2,6 +2,7 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.Map;
 import java.util.Properties;
 
 public class Config {
@@ -16,11 +17,15 @@ public static void initConfig(String file) throws IOException {
     Properties props = new Properties();
     props.load(new FileInputStream(file));
 
-    SERVER_IP = props.getProperty("server");
-    SERVER_PORT = Integer.parseInt(props.getProperty("port"));
-    CONF_DIR = props.getProperty("config_dir");
-    USERNAME = props.getProperty("username");
-    PASSWORD = props.getProperty("password");
+    Map<String, String> env = System.getenv();
+
+    // override config file if ENV variables are set
+    USERNAME = env.containsKey("FIRE_USER") ? env.get("FIRE_USER") : props.getProperty("username");
+    PASSWORD = env.containsKey("FIRE_PASS") ? env.get("FIRE_PASS") : props.getProperty("password");
+    SERVER_IP = env.containsKey("FIRE_SERVER") ? env.get("FIRE_SERVER") : props.getProperty("server");
+    SERVER_PORT = env.containsKey("FIRE_PORT") ? Integer.parseInt(env.get("FIRE_PORT"))
+        : Integer.parseInt(props.getProperty("port"));
+    CONF_DIR = env.containsKey("FIRE_CONF_DIR") ? env.get("FIRE_CONF_DIR") : props.getProperty("config_dir");
 
     props.clear();
   }