Changeset 186:fdaf10ceded4 for siren

Timestamp:

11/28/08 16:33:28 (3 years ago)

Author:

chris@…

Branch:

default

Message:

pull in change of no longer needing log conf

Files:

• siren (modified) (6 diffs)

siren

@@ -43 +43 @@
 
 import logging
+import sys
 from optparse import OptionParser
 
@@ -51 +52 @@
 from StormSiren.History import History, DEFAULT_MAX_HISTORICAL_EVENTS
 
-__RELEASE_VERSION = "2.0 RC3"
+__RELEASE_VERSION = "2.0 RC4"
 __RELEASE_MONTH   = "12"
-__RELEASE_DAY     = "08"
+__RELEASE_DAY     = "01"
 __RELEASE_YEAR    = "2008"
+
+logging.basicConfig(level=logging.INFO,
+                        format='%(asctime)s - %(name)s:%(lineno)d - %(levelname)s - %(message)s')
 
 def main():
@@ -60 +64 @@
         log = logging.getLogger()
 
+        log.setLevel(logging.DEBUG)
 
         parser.add_option("-c", "--conf", dest="conf",
@@ -82 +87 @@
                                         help="Print only important messages to the console")
 
-        parser.add_option("-l", "--logconf", dest="logconf",
-                                        help="Override log configuration file", metavar="file_name", default=None)
-
         parser.add_option("-t", "--testpage", 
                                         action="store_true", dest="testpage", default=False,
@@ -96 +98 @@
                 logging.disable(logging.info)
 
-        conf = StormConfig(options.conf, options.logconf)
+        conf = StormConfig(options.conf)
 
         log.info("StormSiren: v%s (%s/%s/%s)" % (__RELEASE_VERSION, 
@@ -111 +113 @@
         #conf.display()
         #history.display()
+
+        if(len(conf.devices) == 0):
+                log.error("No valid devices found, exiting..")
+                sys.exit(1)
 
         if(not options.testpage):