# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1361908957 18000
# Node ID d33dc1c2d0ada761152f47c98924f3378cb3c7a0
# Parent  cea861983a46ef6d46fc905d20fe74d74d071a7c
Remove agent's debug option
Reviewed-by: jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-February/005841.html

diff -r cea861983a46 -r d33dc1c2d0ad agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/AgentApplication.java
--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/AgentApplication.java	Tue Feb 26 15:01:33 2013 -0500
+++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/AgentApplication.java	Tue Feb 26 15:02:37 2013 -0500
@@ -108,9 +108,6 @@
         long startTime = System.currentTimeMillis();
         configuration.setStartTime(startTime);
         
-        if (configuration.isDebugConsole()) {
-            LoggingUtils.enableConsoleLogging();
-        }
         final Logger logger = LoggingUtils.getLogger(AgentApplication.class);
 
         final DbService dbService = dbServiceFactory.createDbService(
diff -r cea861983a46 -r d33dc1c2d0ad agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java
--- a/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java	Tue Feb 26 15:01:33 2013 -0500
+++ b/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentOptionParser.java	Tue Feb 26 15:02:37 2013 -0500
@@ -60,8 +60,6 @@
             configuration.setPurge(false);
         }
 
-        configuration.setDebugConsole(args.hasArgument("debug"));
-        
         if (args.hasArgument("dbUrl")) {
             String url = args.getArgument("dbUrl");
             configuration.setDatabaseURL(url);
diff -r cea861983a46 -r d33dc1c2d0ad agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java
--- a/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Tue Feb 26 15:01:33 2013 -0500
+++ b/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Tue Feb 26 15:02:37 2013 -0500
@@ -58,14 +58,6 @@
     public String getDBConnectionString() {
         return url;
     }
-    
-    void setDebugConsole(boolean debugConsole) {
-        this.debugConsole = debugConsole;
-    }
-    
-    public boolean isDebugConsole() {
-        return debugConsole;
-    }
 
     public void setDatabaseURL(String url) {
         this.url = url;
diff -r cea861983a46 -r d33dc1c2d0ad agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java
--- a/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java	Tue Feb 26 15:01:33 2013 -0500
+++ b/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentOptionParserTest.java	Tue Feb 26 15:02:37 2013 -0500
@@ -68,14 +68,12 @@
         
         SimpleArguments args = new SimpleArguments();
         args.addArgument("dbUrl", "testURL");
-        args.addArgument("debug", "--debug");
         
         AgentStartupConfiguration configs = AgentConfigsUtils.createAgentConfigs();
         AgentOptionParser parser = new AgentOptionParser(configs, args);
         parser.parse();
         
         Assert.assertEquals("testURL", configs.getDBConnectionString());
-        Assert.assertTrue(configs.isDebugConsole());
         Assert.assertFalse(configs.purge());
     }
     
@@ -91,7 +89,6 @@
         parser.parse();
         
         Assert.assertEquals("testURL2", configs.getDBConnectionString());
-        Assert.assertFalse(configs.isDebugConsole());
         Assert.assertFalse(configs.purge());
     }
 }
diff -r cea861983a46 -r d33dc1c2d0ad distribution/config/commands/agent.properties
--- a/distribution/config/commands/agent.properties	Tue Feb 26 15:01:33 2013 -0500
+++ b/distribution/config/commands/agent.properties	Tue Feb 26 15:02:37 2013 -0500
@@ -21,9 +21,9 @@
 
 description = starts and stops the thermostat agent
 
-usage = agent -d <url> [-u <user> -p <password>] [-s] [--debug] [-l <level>]
+usage = agent -d <url> [-u <user> -p <password>] [-s] [-l <level>]
 
-options = AUTO_LOG_OPTION, AUTO_DB_OPTIONS, saveOnExit, dbUrl, debug
+options = AUTO_LOG_OPTION, AUTO_DB_OPTIONS, saveOnExit, dbUrl
 
 saveOnExit.short = s
 saveOnExit.long = saveOnExit
@@ -32,9 +32,3 @@
 saveOnExit.hasarg = false
 
 dbUrl.required = true
-
-debug.short = v
-debug.long = debug
-debug.hasarg = false
-debug.required = false
-debug.description = launch with debug console enabled