summaryrefslogtreecommitdiff
path: root/src/connection.py
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-01-26 19:33:40 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-01-26 19:33:40 +0000
commit64d5c4b6f322990e94d999172c3eb4146724f872 (patch)
treebbf833ea5e6486707b739f1acfac4504d1100410 /src/connection.py
parent865ab0316a53a32c9caac842bbd54d233cdd2665 (diff)
downloadpoezio-64d5c4b6f322990e94d999172c3eb4146724f872.tar.gz
poezio-64d5c4b6f322990e94d999172c3eb4146724f872.tar.bz2
poezio-64d5c4b6f322990e94d999172c3eb4146724f872.tar.xz
poezio-64d5c4b6f322990e94d999172c3eb4146724f872.zip
ca fonctionne, ca clignotte, et cest gay
Diffstat (limited to 'src/connection.py')
-rw-r--r--src/connection.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/connection.py b/src/connection.py
index 2ef22425..8185994f 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -39,12 +39,7 @@ class Connection(Thread):
self.resource = resource
self.online = 0 # 1:connected, 2:auth confirmed
self.jid = '' # we don't know our jid yet (anon account)
- if not self.server:
- logger.error('You should set a server in the configuration file')
- self.port = int(config.get('port'))
- if not self.port:
- logger.warning('No port set in configuration file, defaulting to 5222')
- self.port = 5222
+ self.port = config.get('port', 5222)
self.client = xmpp.Client(self.server, debug=[])
def run(self):
@@ -105,17 +100,3 @@ class Connection(Thread):
else:
log.warning('disconnecting...')
sys.exit()
-
-if __name__ == '__main__':
- resource = config.get('resource')
- server = config.get('server')
- connection = Connection(server, resource)
- connection.start()
- rooms = config.get('rooms').split(':')
- from time import sleep
- print connection.online
- sleep(2)
- print connection.online
- for room in rooms:
- connection.send_join_room(room.split('/')[0], room.split('/')[1])
- i = 17