Changeset 190:75d280708ff5 for StormSiren/StormConfig.py

Timestamp:

11/29/08 00:48:18 (3 years ago)

Author:

cfreeze@…

Branch:

default

Parents:

189:8190540dae37 (diff), 185:c20e85874308 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

correct merge problems that are showing up from bad branching

Files:

• StormSiren/StormConfig.py (modified) (6 diffs)

StormSiren/StormConfig.py

@@ -64 +64 @@
                 self.__states          = []
                 self.devices           = []
-                self.__history_file    = ''
+                self.__history_file  = self.config_dir + '/' + __APPNAME__ + '.history'
+                self.log               = logging.getLogger('StormConfig')
                 self.__max_history     = History.DEFAULT_MAX_HISTORICAL_EVENTS
-                self.__history_file    = self.config_dir + '/' + __APPNAME__ + '.history'
-                self.log               = logging.getLogger('StormConfig')
-
-                self.log.setLevel(logging.INFO)
-
-                self._load()
+                self.__proxy           = ''
+
+                self.log.setLevel(logging.DEBUG)
+                self._load()
 
         def _load(self):
@@ -88 +87 @@
 
                 xstates = self.getRequired('main','states')
-                if xstates:
+                if(xstates):
                          self.__states = string.split(xstates, ',')
+
+                self.__proxy = self.get('main','proxy', None)
 
                 num_watchers = self.getRequired('main','watchers')
@@ -143 +144 @@
                                 if(jabber_available):
                                         to = self.getRequired(str(i),"to")
-                                        self.devices.append(JabberAlertDevice(to,jabberInfo,alerts,areas))
+                                        wait_time = int(self.getRequired(str(i),"wait_time"))
+                                        self.devices.append(MythtvAlertDevice(MythtvAlertDeviceInfo(to,wait_time),alerts,areas))
                                         self.log.debug("Adding jabber device")
                                 else:
                                         self.log.error("Jabber Support Not Enabled, but Jabber Device Requested!")
+                        if(dev == "media"):
+                                self.devices.append(MediaAlertDevice(mediaInfo,alerts,areas))
+                                self.log.debug("Adding media device")
+                        if(dev == "execution"):
+                                self.devices.append(ExecutionAlertDevice(exeInfo,alerts,areas))
+                                self.log.debug("Adding execution device")
                         if(dev == "osd"):
                                 if(not osdLoadAttempted):
@@ -166 +174 @@
                                                                                                                                                         font),
                                                                                                                 alerts,areas))
-                                        self.log.debug("Adding OSD device")
+                                        self.log.debug("Adding jabber device")
                                 else:
                                         self.log.error("OSD Support Not Enabled, but OSD Device Requested!")
                         if(dev == "mythtv"):
-                                to = self.getRequired(str(i),"to")
-                                wait_time = int(self.getRequired(str(i),"wait_time"))
-                                self.devices.append(MythtvAlertDevice(MythtvAlertDeviceInfo(to,wait_time),alerts,areas))
-                                self.log.debug("Adding MythTv device")
-                        if(dev == "media"):
-                                self.devices.append(MediaAlertDevice(mediaInfo,alerts,areas))
-                                self.log.debug("Adding media device")
-                        if(dev == "execution"):
-                                self.devices.append(ExecutionAlertDevice(exeInfo,alerts,areas))
-                                self.log.debug("Adding execution device")
+                                to = self.getRequired(str(i),"to")
+                                wait_time = int(self.getRequired(str(i),"wait_time"))
+                                self.devices.append(MythtvAlertDevice(MythtvAlertDeviceInfo(to,wait_time),alerts,areas))
+                                self.log.debug("Adding mythtv device")
 
         def __str__(self):
@@ -185 +187 @@
                 str += "\n\t".join(self.__states)
 
-                str += "\nHistory: %i\n" % self.max_history
+                str += "\nProxy: %s" % self.proxy
+                str += "\nHistory: %i" % self.max_history
                 str += "\nDevices: %i\n" % len(self.devices)
 
@@ -230 +233 @@
                 return self.__max_history
 
+        def getProxy(self):
+                return self.__proxy
+
         debug = property(getDebug,None,None)
         max_history = property(getMaxHistory,None,None)
+        proxy = property(getProxy,None,None)