tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

doorlockd.py: remove argparse dependency

Browse Source 
by replacing its logic with flask's config parameter file.

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
This commit is contained in:
Ralf Ramsauer 2018-03-18 16:35:09 +01:00
parent 3e8fce5b81
commit 84e9440ed6
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doorlockd-new/config.cfg
View File

@ -2,3 +2,5 @@ DEBUG = True
SECRET_KEY = 'foobar' SECRET_KEY = 'foobar'
BOOTSTRAP_SERVE_LOCAL = True BOOTSTRAP_SERVE_LOCAL = True
SERIAL_PORT = '/dev/ttyS0'

14
doorlockd-new/doorlockd.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse
import logging import logging
import sys import sys
@ -30,7 +29,6 @@ date_fmt = '%Y-%m-%d %H:%M:%S'
log_fmt = '%(asctime)-15s %(levelname)-8s %(message)s' log_fmt = '%(asctime)-15s %(levelname)-8s %(message)s'
log = logging.getLogger() log = logging.getLogger()
default_serial = '/dev/ttyS0'
default_ldap_uri = 'ldaps://ldap1.binary.kitchen/ ' \ default_ldap_uri = 'ldaps://ldap1.binary.kitchen/ ' \
'ldaps://ldap2.binary.kitchen/ ' \ 'ldaps://ldap2.binary.kitchen/ ' \
'ldaps://ldapm.binary.kitchen/' 'ldaps://ldapm.binary.kitchen/'
@ -162,8 +160,8 @@ class DoorHandler:
class Logic: class Logic:
def __init__(self, device): def __init__(self):
self.door_handler = DoorHandler(device) self.door_handler = DoorHandler(webapp.config.get('SERIAL_PORT'))
def _try_auth_ldap(self, user, password): def _try_auth_ldap(self, user, password):
log.info('Trying to LDAP auth (user, password) as user %s', user) log.info('Trying to LDAP auth (user, password) as user %s', user)
@ -265,16 +263,12 @@ def home():
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser('doorlockd', 'Binary Kitchen doorlockd')
parser.add_argument('-s', '--serial', default=default_serial, type=str)
args = parser.parse_args()
logging.basicConfig(level=log_level, stream=sys.stdout, logging.basicConfig(level=log_level, stream=sys.stdout,
format=log_fmt, datefmt=date_fmt) format=log_fmt, datefmt=date_fmt)
log.info('Starting doorlockd') log.info('Starting doorlockd')
log.info('Using serial port: %s' % args.serial) log.info('Using serial port: %s' % webapp.config.get('SERIAL_PORT'))
logic = Logic(args.serial) logic = Logic()
socketio.run(webapp, port=8080) socketio.run(webapp, port=8080)