From 72e5af1584390c20dcf32c32eeef0b097a6cce89 Mon Sep 17 00:00:00 2001 From: realraum Date: Fri, 18 Sep 2009 00:12:29 +0000 Subject: [PATCH] debug flag im configfile --- update-web-status.py | 9 ++++++++- update-xmpp-status.py | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/update-web-status.py b/update-web-status.py index 19bda77..77159ac 100755 --- a/update-web-status.py +++ b/update-web-status.py @@ -31,6 +31,8 @@ class UWSConfig: self.config_parser.set('web','cgiuri','https://www.realraum.at/cgi/status.cgi?pass=jako16&set=') self.config_parser.set('web','htmlopen','
Tür ist Offen
') self.config_parser.set('web','htmlclosed','
Tür ist Geschlossen
') + self.config_parser.add_section('debug') + self.config_parser.set('debug','enabled',"False") self.config_mtime=0 if not self.configfile is None: try: @@ -42,6 +44,7 @@ class UWSConfig: self.checkConfigUpdates() def checkConfigUpdates(self): + global logger if self.configfile is None: return logging.debug("Checking Configfile mtime: "+self.configfile) @@ -56,6 +59,10 @@ class UWSConfig: self.config_mtime=os.path.getmtime(self.configfile) except ConfigParser.ParsingError, pe_ex: logging.error("Error parsing Configfile: "+str(pe_ex)) + if self.config_parser.get('debug','enabled') == "True": + logger.setLevel(logging.DEBUG) + else: + logger.setLevel(logging.INFO) def writeConfigFile(self): if self.configfile is None: @@ -184,7 +191,7 @@ if len(sys.argv) > 2: else: uwscfg = UWSConfig() -socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well) +#socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well) sockhandle = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) RE_STATUS = re.compile(r'Status: (\w+), idle') RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)') diff --git a/update-xmpp-status.py b/update-xmpp-status.py index 18c0c76..908aae0 100644 --- a/update-xmpp-status.py +++ b/update-xmpp-status.py @@ -34,6 +34,8 @@ class UWSConfig: self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org') self.config_parser.set('xmpp','msg_opened',"Realraum Tür wurde%s geöffnet") self.config_parser.set('xmpp','msg_closed',"Realraum Tür wurde%s geschlossen") + self.config_parser.add_section('debug') + self.config_parser.set('debug','enabled',"False") self.config_mtime=0 if not self.configfile is None: try: @@ -45,6 +47,7 @@ class UWSConfig: self.checkConfigUpdates() def checkConfigUpdates(self): + global logger if self.configfile is None: return logging.debug("Checking Configfile mtime: "+self.configfile) @@ -59,6 +62,10 @@ class UWSConfig: self.config_mtime=os.path.getmtime(self.configfile) except ConfigParser.ParsingError, pe_ex: logging.error("Error parsing Configfile: "+str(pe_ex)) + if self.config_parser.get('debug','enabled') == "True": + logger.setLevel(logging.DEBUG) + else: + logger.setLevel(logging.INFO) def writeConfigFile(self): if self.configfile is None: -- 1.7.10.4