Changeset d891915 for skype

Timestamp:

2008-05-19T18:22:03Z (17 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

9627276

Parents:

d0a6a8c

Message:

allow setting the port from the config file

Location:

skype

Files:

• skyped.conf.dist.in (modified) (1 diff)
• skyped.py (modified) (5 diffs)

skype/skyped.conf.dist.in

@@ -5 +5 @@
 cert = @sysconfdir@/skyped/skyped.cert.pem
 key  = @sysconfdir@/skyped/skyped.key.pem
+port = 2727

skype/skyped.py

@@ -31 +31 @@
 import Skype4Py
 import sha
-from ConfigParser import ConfigParser
+from ConfigParser import ConfigParser, NoOptionError
 from traceback import print_exception
 
@@ -183 +183 @@
                 self.help = False
                 self.host = "0.0.0.0"
-                self.port = 2727
+                self.port = None
                 self.version = False
                 # well, this is a bit hackish. we store the socket of the last connected client
@@ -225 +225 @@
                         options.daemon = False
                 elif opt in ("-p", "--port"):
-                        options.port = arg
+                        options.port = int(arg)
                 elif opt in ("-v", "--version"):
                         options.version = True
@@ -244 +244 @@
         options.config.sslkey = options.config.get('skyped', 'key').split('#')[0]
         options.config.sslcert = options.config.get('skyped', 'cert').split('#')[0]
+        # hack: we have to parse the parameters first to locate the
+        # config file but the -p option should overwrite the value from
+        # the config file
+        try:
+                options.config.port = int(options.config.get('skyped', 'port').split('#')[0])
+                if not options.port:
+                        options.port = options.config.port
+        except NoOptionError:
+                pass
+        if not options.port:
+                options.port = 2727
         dprint("Parsing config file '%s' done, username is '%s'." % (options.cfgpath, options.config.username))
         if options.daemon:
@@ -256 +267 @@
                         print 'skyped is started on port %s, pid: %d' % (options.port, pid)
                         sys.exit(0)
+        else:
+                dprint('skyped is started on port %s' % options.port)
         server(options.host, options.port)
         try: