From a80b915d10c415f23de54ee7b8e2a42ed6548b78 Mon Sep 17 00:00:00 2001
From: Alexandr <ab@sun.hexor.ru>
Date: Fri, 17 May 2019 14:21:38 +0300
Subject: [PATCH] Improve logging.

---
 assets/cert.sh | 2 +-
 database.py    | 3 ++-
 webhook.py     | 3 +++
 worker.py      | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/assets/cert.sh b/assets/cert.sh
index 1842917..9eb390b 100755
--- a/assets/cert.sh
+++ b/assets/cert.sh
@@ -1 +1 @@
-openssl req -newkey rsa:2048 -sha256 -nodes -keyout cert.key -x509 -days 365 -out cert.pem -subj /C=US/ST=New York/L=Brooklyn/O=Example Brooklyn Company/CN=hexor.ru
+openssl req -newkey rsa:2048 -sha256 -nodes -keyout cert.key -x509 -days 3650 -out cert.pem -subj "/C=US/ST=New York/L=Brooklyn/O=Example Brooklyn Company/CN=hexor.ru"
diff --git a/database.py b/database.py
index aa0ce97..d99920b 100755
--- a/database.py
+++ b/database.py
@@ -109,7 +109,8 @@ class DataBase:
 
     def add_alert(self, user_id, conf_id, alert_time, message):
         date = int(dt.datetime.now().strftime("%s"))
-        if len(alert_time) < 4:
+        print(alert_time)
+        if alert_time[0] == '+':
             alert_time = (dt.datetime.now() + dt.timedelta(minutes=int(alert_time[1:]))).strftime("%H%M")
         sql = """INSERT OR IGNORE INTO 
         alert('conf_id', 'user_id', 'created', 'time', 'message') 
diff --git a/webhook.py b/webhook.py
index 4396a11..db6dbe3 100755
--- a/webhook.py
+++ b/webhook.py
@@ -30,6 +30,7 @@ class RequestHandler(SimpleHTTPRequestHandler):
 
         length = self.headers.get('content-length')
         post_body = self.rfile.read(int(length))
+        print(post_body)
         msg = json.loads(post_body.decode("utf-8"))
         self.worker.handleUpdate(msg)
 
@@ -56,6 +57,8 @@ class WebHook:
             self.httpd.serve_forever()
         except KeyboardInterrupt:
             pass
+        except Exception as e:
+            print("ERROR: %s" % e)
         finally:
             # Clean-up server (close socket, etc.)
             self.httpd.server_close()
diff --git a/worker.py b/worker.py
index 19a9720..5232cf3 100755
--- a/worker.py
+++ b/worker.py
@@ -48,7 +48,7 @@ class MessageWorker:
         except ValueError:
             pass
         try:
-            if (int(string[1:]) > 0) and (string[0] == '+') and (len(string[1:]) < 3):
+            if (int(string[1:]) > 0) and (string[0] == '+') and (len(string[1:]) < 4):
               return string
         except:
             pass
@@ -222,7 +222,8 @@ class MessageWorker:
                         print(e)
                 self.send_img(conf_id)
                 return True
-        except:
+        except Exception as e:
+            print('ERROR: %s' % e)
             return False
         try:
             text = msg['message']['text']