From 9209277c08273f6f949c44cdae0f290fcf2bc7e1 Mon Sep 17 00:00:00 2001 From: realraum Date: Sat, 20 Mar 2010 07:40:09 +0000 Subject: [PATCH] Status Scripts --- track-presence.py | 2 +- update-web-status.py | 2 +- update-xmpp-status.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/track-presence.py b/track-presence.py index 1852507..eed38df 100644 --- a/track-presence.py +++ b/track-presence.py @@ -46,7 +46,7 @@ class UWSConfig: self.config_parser.set('sensors','remote_socket',"/var/run/powersensordaemon/cmd.sock") self.config_parser.set('sensors','remote_shell',"usocket") self.config_parser.add_section('tracker') - self.config_parser.set('tracker','sec_wait_movement_after_door_closed',2.5) + self.config_parser.set('tracker','sec_wait_movement_after_door_closed',"2.5") self.config_parser.set('tracker','sec_general_movement_timeout',3600) self.config_parser.set('tracker','server_socket',"/var/run/tuer/presence.socket") self.config_parser.set('tracker','photo_flashlight',950) diff --git a/update-web-status.py b/update-web-status.py index a2e4beb..8bdd4aa 100755 --- a/update-web-status.py +++ b/update-web-status.py @@ -197,7 +197,7 @@ else: #socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well) #RE_STATUS = re.compile(r'Status: (\w+), idle') RE_PRESENCE = re.compile(r'Presence: (yes|no)') -RE_BUTTON = re.compile(r'button\d?') +RE_BUTTON = re.compile(r'PanicButton|button\d?') while True: try: if not os.path.exists(uwscfg.tracker_socket): diff --git a/update-xmpp-status.py b/update-xmpp-status.py index 04bd22c..8c64d5c 100755 --- a/update-xmpp-status.py +++ b/update-xmpp-status.py @@ -31,9 +31,9 @@ class UWSConfig: self.config_parser.add_section('xmpp') self.config_parser.set('xmpp','recipients_debug','xro@jabber.tittelbach.at') self.config_parser.set('xmpp','recipients_normal','xro@jabber.tittelbach.at otti@wirdorange.org') - self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org') + self.config_parser.set('xmpp','recipients_nooffline','the-equinox@jabber.org davrieb@jabber.ccc.de') self.config_parser.add_section('msg') - self.config_parser.set('msg','bored',"Somebody is bored and in need of company. Go Visit !") + self.config_parser.set('msg','bored',"The Button has been pressed ! Maybe somebody want's company. Go Visit !") self.config_parser.set('msg','format',"${status_msg}${request_msg}${comment_msg}") self.config_parser.set('msg','status_opened_msg',"RealRaum door now open") self.config_parser.set('msg','status_closed_msg',"RealRaum door now closed") @@ -269,7 +269,7 @@ distributeXmppMsg("update-xmpp-status.py started", debug=True) RE_STATUS = re.compile(r'Status: (\w+), idle') RE_REQUEST = re.compile(r'Request: (\w+) (?:Card )?(.+)') RE_PRESENCE = re.compile(r'Presence: (yes|no)') -RE_BUTTON = re.compile(r'button\d?') +RE_BUTTON = re.compile(r'PanicButton|button\d?') RE_ERROR = re.compile(r'Error: (.+)') while True: try: -- 1.7.10.4