summaryrefslogtreecommitdiff
path: root/beinc_server.py
diff options
context:
space:
mode:
authorSimeon Simeonov2015-04-18 21:12:03 +0200
committerSimeon Simeonov2015-04-18 21:12:03 +0200
commit34846014399f8756962051df02d251b91b65bb0c (patch)
treec3659df8e9ab10713d40cb17343bfa9f2e8d37d9 /beinc_server.py
parent5d19e4e05f8fcd44e6a596f5e919fb91e45e54b7 (diff)
Update documentation changelog and examples. Final touches
Diffstat (limited to 'beinc_server.py')
-rwxr-xr-xbeinc_server.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/beinc_server.py b/beinc_server.py
index 53f12c5..84f7a82 100755
--- a/beinc_server.py
+++ b/beinc_server.py
@@ -59,6 +59,8 @@ BEINC_OSD_TYPE_NONE = 0
59BEINC_OSD_TYPE_PYNOTIFY = 1 59BEINC_OSD_TYPE_PYNOTIFY = 1
60BEINC_OSD_TYPE_PYOSD = 2 60BEINC_OSD_TYPE_PYOSD = 2
61 61
62BEINC_CURRENT_CONFIG_VERSION = 2
63
62BEINC_SSL_METHODS = {'SSLv3': OpenSSL.SSL.SSLv3_METHOD, 64BEINC_SSL_METHODS = {'SSLv3': OpenSSL.SSL.SSLv3_METHOD,
63 'TLSv1': OpenSSL.SSL.TLSv1_METHOD} 65 'TLSv1': OpenSSL.SSL.TLSv1_METHOD}
64try: 66try:
@@ -351,11 +353,15 @@ def main():
351 e)) 353 e))
352 sys.exit(errno.EIO) 354 sys.exit(errno.EIO)
353 try: 355 try:
354 if config_dict.get('config_version') != 2: 356 if config_dict.get('config_version') != BEINC_CURRENT_CONFIG_VERSION:
355 sys.stderr.write( 357 sys.stderr.write(
356 'Incompatible or missing config-file version for {0}\n'.format( 358 'WARNING: The version of the config-file: {0} ({1}) '
357 args.config_file)) 359 'does not correspond to the latest version supported '
358 sys.exit(1) 360 'by this program ({2})\nCheck beinc_config_sample.json '
361 'for the newest features!\n'.format(
362 args.config_file,
363 config_dict.get('config_version', 'Not set'),
364 BEINC_CURRENT_CONFIG_VERSION))
359 ssl_certificate = config_dict['server']['general'].get( 365 ssl_certificate = config_dict['server']['general'].get(
360 'ssl_certificate') 366 'ssl_certificate')
361 ssl_private_key = config_dict['server']['general'].get( 367 ssl_private_key = config_dict['server']['general'].get(