changeset 1020:2cf329c9cff9

Make -d option for agent optional. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-March/005951.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Fri, 01 Mar 2013 14:05:40 +0100
parents f84a49f6c797
children 8ea56b57334c
files distribution/config/agent.properties distribution/config/commands/agent.properties
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/agent.properties	Mon Mar 04 17:04:10 2013 -0500
+++ b/distribution/config/agent.properties	Fri Mar 01 14:05:40 2013 +0100
@@ -1,4 +1,4 @@
-# indicates if this agent will save its data to the database on exit
+# Indicates if this agent will save its data to the database on exit
 # or rather will purge the db
 SAVE_ON_EXIT=false
 
@@ -7,3 +7,9 @@
 # configured here.
 # If this is removed or commented out, the default port is 127.0.0.1:12000
 CONFIG_LISTEN_ADDRESS=127.0.0.1:12000
+
+# Connection URL to storage. This can be overridden with the -d option
+# on the command line. In order to use web storage instead, use something
+# similar to the following line:
+#DB_URL=https://storage-server.example.com:8443/thermostat/storage
+DB_URL=mongodb://127.0.0.1:27518
--- a/distribution/config/commands/agent.properties	Mon Mar 04 17:04:10 2013 -0500
+++ b/distribution/config/commands/agent.properties	Fri Mar 01 14:05:40 2013 +0100
@@ -21,14 +21,12 @@
 
 description = starts and stops the thermostat agent
 
-usage = agent -d <url> [-u <user> -p <password>] [-s] [-l <level>]
+usage = agent [-d <url>] [-u <user> -p <password>] [-s] [-l <level>]
 
-options = AUTO_LOG_OPTION, AUTO_DB_OPTIONS, saveOnExit, dbUrl
+options = AUTO_LOG_OPTION, AUTO_DB_OPTIONS, saveOnExit
 
 saveOnExit.short = s
 saveOnExit.long = saveOnExit
 saveOnExit.description = save the data on exit
 saveOnExit.required = false
 saveOnExit.hasarg = false
-
-dbUrl.required = true