Updated CLI flags.

Author: sebinside

src/main/scala/org/codeoverflow/chatoverflow/ChatOverflow.scala

@@ -21,7 +21,6 @@ import org.codeoverflow.chatoverflow.registry.TypeRegistry
 class ChatOverflow(val pluginFolderPath: String,
                    val configFolderPath: String,
                    val requirementPackage: String,
-                   val requirePasswordOnStartup: Boolean,
                    val logOutputOnConsole: Boolean)
   extends WithLogger {
 
@@ -62,13 +61,6 @@ class ChatOverflow(val pluginFolderPath: String,
     ConnectorRegistry.setTypeRegistry(typeRegistry)
     logger debug "Finished updating type registry."
 
-    if (requirePasswordOnStartup && !loaded) {
-      logger debug "Loading configs and credentials."
-      askForPassword()
-      load()
-      logger debug "Finished loading configs and credentials."
-    }
-
     logger debug "Finished initialization."
   }
 
@@ -107,14 +99,6 @@ class ChatOverflow(val pluginFolderPath: String,
     System.setSecurityManager(new SecurityManager)
   }
 
-  private def askForPassword(): Unit = {
-    val password = if (System.console() != null)
-      System.console().readPassword("Please enter password (Input hidden) > ")
-    else
-      scala.io.StdIn.readLine("Please enter password (Input NOT hidden) > ").toCharArray
-    credentialsService.setPassword(password)
-  }
-
   /**
     * Saves all settings and credentials to the corresponding files in the config folder.
     */

src/main/scala/org/codeoverflow/chatoverflow/Launcher.scala

@@ -23,7 +23,7 @@ object Launcher extends WithLogger {
 
       // The complete project visible trough one single instance
       val chatOverflow = new ChatOverflow(config.pluginFolderPath,
-        config.configFolderPath, config.requirementPackage, config.requirePasswordOnStartup, config.pluginLogOutputOnConsole)
+        config.configFolderPath, config.requirementPackage, config.pluginLogOutputOnConsole)
 
       // Initialize chat overflow
       chatOverflow.init()
@@ -38,15 +38,20 @@ object Launcher extends WithLogger {
       startServer(chatOverflow, config.webServerPort)
 
       // Start plugins if specified
-      if (chatOverflow.isLoaded && config.startupPlugins.nonEmpty) {
-        for (instanceName <- config.startupPlugins) {
-          val instance = chatOverflow.pluginInstanceRegistry.getPluginInstance(instanceName)
+      if (config.startupPlugins.nonEmpty) {
+        if (chatOverflow.isLoaded) {
+          logger info "Starting startup plugins."
+          for (instanceName <- config.startupPlugins) {
+            val instance = chatOverflow.pluginInstanceRegistry.getPluginInstance(instanceName)
 
-          if (instance.isEmpty) {
-            println(s"No plugin instance named '$instanceName' was registered.")
-          } else {
-            instance.get.start()
+            if (instance.isEmpty) {
+              logger warn s"No plugin instance named '$instanceName' was registered."
+            } else {
+              instance.get.start()
+            }
           }
+        } else {
+          logger warn "Unable to run startup plugins. No/wrong password supplied."
         }
       }
     }

src/main/scala/org/codeoverflow/chatoverflow/ui/CLI.scala

@@ -22,25 +22,20 @@ object CLI {
     opt[String]('r', "requirementPackage").action((x, c) =>
       c.copy(requirementPackage = x)).text("path to the package where all requirements are defined")
 
-    // Subject of change. After GUI will be -l (for login)
-    opt[Unit]('n', "noPassword").action((_, c) =>
-      c.copy(requirePasswordOnStartup = false)).text("set this flag to disable password checking on framework startup")
-
     opt[String]('l', "login").action((x, c) =>
-      c.copy(loginPassword = x.toCharArray)).text("the password to login to chat overflow (not recommended, has to be combined with -n)")
+      c.copy(loginPassword = x.toCharArray)).text("the password to login to chat overflow on framework startup")
 
     opt[Seq[String]]('s', "start").action((x, c) =>
-      c.copy(startupPlugins = x)).text("a comma-separated list of plugin instances to start after login (has to be combined with -n and -l)")
+      c.copy(startupPlugins = x)).text("a comma-separated list of plugin instances to start after login (has to be combined with -l)")
 
     opt[String]('d', "pluginDataFolder").action((x, c) =>
       c.copy(pluginDataPath = x)).text("path to the data folder, accessible from within plugins")
 
     opt[Int]('w', "webServerPort").action((x, c) =>
-      c.copy(webServerPort = x)).text("default web server port, used eg. for the rest api")
+      c.copy(webServerPort = x)).text("default web server port, used eg. for the rest api and web gui")
 
-    // Subject of change. After GUI will be -o (enablePluginOutput)
-    opt[Unit]('z', "disableLogOutputOnConsole").action((_, c) =>
-      c.copy(pluginLogOutputOnConsole = false)).text("set this flag to disable plugin log output on console")
+    opt[Unit]('o', "enablePluginOutput").action((_, c) =>
+      c.copy(pluginLogOutputOnConsole = true)).text("set this flag to enable plugin log output on console")
 
     help("help").hidden().text("prints this usage text")
 
@@ -67,10 +62,9 @@ object CLI {
   case class Config(pluginFolderPath: String = "plugins/",
                     configFolderPath: String = "config/",
                     requirementPackage: String = "org.codeoverflow.chatoverflow.requirement",
-                    requirePasswordOnStartup: Boolean = true,
                     pluginDataPath: String = "data",
                     webServerPort: Int = 2400,
-                    pluginLogOutputOnConsole: Boolean = true,
+                    pluginLogOutputOnConsole: Boolean = false,
                     loginPassword: Array[Char] = Array[Char](),
                     startupPlugins: Seq[String] = Seq[String]())