Changeset 142:814d4a3c6ca0

Timestamp:

11/09/08 03:04:44 (3 years ago)

Author:

chris

Branch:

unix

Message:

Added support for using a proxy to get files from weather.gov. In the [main] section a keyword called 'proxy' can be used. The form should be ' http://proxy.example.com:3128' for example.

Files:

• .todo (modified) (1 diff)
• StormSiren/StormConfig.py (modified) (4 diffs)
• StormSiren/StormWeather.py (modified) (1 diff)
• StormSiren/XmlWeather.py (modified) (3 diffs)
• siren (modified) (1 diff)

.todo

@@ -27 +27 @@
         create script to ram all the code into a single file to make it more like the original program
     </note>
-    <note priority="medium" time="1226198990">
+    <note priority="medium" time="1226198990" done="1226199792">
         allow use of a proxy to fetch the xml files
+        <comment>
+            Added support, new config in [main] section called 'proxy'
+        </comment>
     </note>
 </todo>

StormSiren/StormConfig.py

@@ -65 +65 @@
                 self.log               = logging.getLogger('StormConfig')
                 self.__max_history     = History.DEFAULT_MAX_HISTORICAL_EVENTS
+                self.__proxy           = ''
 
                 super(StormConfig,self).__init__(__APPNAME__,config_file, log_config_file)
@@ -85 +86 @@
 
                 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')
@@ -174 +177 @@
                 str += "\n\t".join(self.__states)
 
+                str += "\nProxy: %i\n" % self.__proxy
                 str += "\nHistory: %i\n" % self.max_history
                 str += "\nDevices: %i\n" % len(self.devices)
@@ -219 +223 @@
                 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)

StormSiren/StormWeather.py

@@ -51 +51 @@
 
 class StormWeather(XmlWeather):
-        def __init__(self, state, history, simfetch = False, simalert = False):
-                super(StormWeather,self).__init__(state,history,simfetch)
+        def __init__(self, state, history, simfetch = False, simalert = False, proxy = None):
+                super(StormWeather,self).__init__(state,history,simfetch,proxy)
                 self.log = logging.getLogger("StormWeather")
                 self.__alert_devs = []

StormSiren/XmlWeather.py

@@ -51 +51 @@
 
 class XmlWeather(object):
-        def __init__(self, state, history, simfetch = False):
+        def __init__(self, state, history, simfetch = False, proxy = None):
                 super(XmlWeather,self).__init__()
                 self.__data       = ''
@@ -62 +62 @@
                 self.__history    = history
                 self.__simfetch   = simfetch
+                self.__proxy      = proxy
                 self.log = logging.getLogger("XmlWeather")
 
@@ -78 +79 @@
                                 self.__dom = minidom.parse("examples/" + self.__state.lower() + ".cap")
                         else:
-                                self.__dom = minidom.parse(urllib.urlopen(self.__url))
+                                proxy = None
+                                if(self.__proxy):
+                                        self.log.info("Using proxy: %s" % self.__proxy)
+                                        proxy = { 'http' : self.__proxy }
+                                self.__dom = minidom.parse(urllib.urlopen(self.__url, proxies = proxy))
                 except IOError,e:
                         # No net connection available, exit.

siren

@@ -115 +115 @@
                 for state in conf.states:
                         log.info("State: " + state)
-                        xw = StormWeather(state,history,options.simfetch,options.simalert)
+                        xw = StormWeather(state,history,options.simfetch,options.simalert,conf.proxy)
                         #xw.display()
                         for dev in conf.devices: