From ef8ddb0e176f555a2644928b94d8b7178addba75 Mon Sep 17 00:00:00 2001 From: deflax Date: Thu, 26 May 2016 00:56:14 +0300 Subject: [PATCH] cosmetic changes --- clientsdb.py | 6 ++++-- proxmaster.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/clientsdb.py b/clientsdb.py index dc004c0..882e04f 100644 --- a/clientsdb.py +++ b/clientsdb.py @@ -72,7 +72,9 @@ def checkin(clientid): try: clientsdb = readclientsdb() c_id = clientsdb[str(clientid)] - ioconfig.logger.info('client[{}]> checked in'.format(c_id)) + #c_id.pop('encpasswd') + email = c_id['email'] + ioconfig.logger.info('client[{}]> {} active'.format(clientid, email)) return c_id except: ioconfig.logger.error('clients> user id: {} could not be checked.'.format(clientid)) @@ -153,5 +155,5 @@ def writeclientsdb(clientsdb): if __name__ == '__main__': - setencpasswd('abc@xyz.com', 'todos') + setencpasswd('a@b.c', '123456') diff --git a/proxmaster.py b/proxmaster.py index ac40e03..e63c6ef 100644 --- a/proxmaster.py +++ b/proxmaster.py @@ -27,7 +27,7 @@ def welcome(): def selector(fn, req, vmid=0): """ try to exec commands """ json = req.context['doc'] - print(json) #TODO: remove debug print + #print(json) #TODO: remove debug print apipass = json['apikey'] if apipass != config.get('general', 'apipass'): status = falcon.HTTP_403