fix(logging): more logs

admin.py

@@ -3,6 +3,7 @@
 
 import click
 import sys
+import logging
 
 
 @click.group(name="admin")
@@ -15,7 +16,7 @@ def cli():
 @click.option("--password", help="org id")
 @click.option("--org", help="org id")
 def cmd_add_user(email, password, org):
-    print("add user")
+    logging.info("add user")
 
 
 @cli.command(name="chanageorg")

api/push.py

@@ -120,8 +120,11 @@ def post(self):
                         token=self.token, alert=alert, extra=extra, payload=fcm_payload
                     )
                 except Exception as ex:
-                    _logger.error("catch exception from fcm.py %s" % str(ex))
-                    self.send_response(INTERNAL_SERVER_ERROR, dict(error=str(ex)))
+                    _logger.error(str(ex))
+                    statuscode = ex.response_statuscode
+                    self.send_response(
+                        statuscode, dict(error="error response from fcm")
+                    )
                     return
 
             elif device == DEVICE_TYPE_IOS:

app.py

@@ -220,7 +220,7 @@ def main(self):
                 ssl_ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
                 ssl_ctx.load_cert_chain(options.httpscertfile, options.httpskeyfile)
             except IOError:
-                print("Invalid path to SSL certificate and private key")
+                _logger.error("Invalid path to SSL certificate and private key")
                 raise
             http_server = tornado.httpserver.HTTPServer(self, ssl_options=ssl_ctx)
         else:

controllers/keys.py

@@ -30,6 +30,9 @@
 from api import API_PERMISSIONS
 from controllers.base import *
 from util import *
+import logging
+
+_logger = logging.getLogger()
 
 
 @route(r"/applications/([^/]+)/keys")
@@ -56,8 +59,7 @@ def get(self, appname):
         if key_to_be_deleted:
             self.db.keys.remove({"key": key_to_be_deleted})
             self.redirect("/applications/%s/keys" % appname)
-        print((list(API_PERMISSIONS.items())))
-        print(app)
+        _logger.info((list(API_PERMISSIONS.items())))
         self.render(
             "app_keys.html",
             app=app,

controllers/settings.py

@@ -49,7 +49,7 @@
 import traceback
 from controllers.base import *
 
-_logger = logging.getLogger("settings")
+_logger = logging.getLogger()
 
 
 @route(r"/applications/([^/]+)/settings[\/]?")
@@ -60,7 +60,6 @@ def get(self, appname):
             self.redirect(r"/create/app")
         else:
             app = self.masterdb.applications.find_one({"shortname": appname})
-            print(app)
             if not file_exists(app.get("certfile", "")):
                 app["certfile"] = None
             if not file_exists(app.get("keyfile", "")):
@@ -179,12 +178,12 @@ def post(self, appname):
                 self.perform_feedback(app)
 
             if self.get_argument("launchapns", None):
-                logging.info("Start APNS")
+                _logger.info("Start APNS")
                 app["enableapns"] = 1
                 self.start_apns(app)
 
             if self.get_argument("stopapns", None):
-                logging.info("Shutdown APNS")
+                _logger.info("Shutdown APNS")
                 app["enableapns"] = 0
                 self.stop_apns(app)
 
@@ -237,5 +236,5 @@ def post(self, appname):
             self.masterdb.applications.update({"shortname": self.appname}, app)
             self.redirect(r"/applications/%s/settings" % self.appname)
         except Exception as ex:
-            logging.error(traceback.format_exc())
+            _logger.error(traceback.format_exc())
             self.render("app_settings.html", app=app, error=str(ex))

install.py

@@ -32,6 +32,7 @@
 from pymongo.errors import CollectionInvalid
 from tornado.options import define, options
 import tornado.options
+import logging
 from util import *
 
 from constants import VERSION
@@ -75,17 +76,17 @@
     try:
         if not "applications" in collection_names:
             masterdb.create_collection("applications")
-            print("db.applications installed")
+            logging.info("db.applications installed")
     except CollectionInvalid as ex:
-        print(("Failed to created applications collection", ex))
+        logging.info(("Failed to created applications collection", ex))
         pass
 
     try:
         if not "managers" in collection_names:
             masterdb.create_collection("managers")
             #  masterdb.managers.ensure_index("username", unique=True)
             masterdb.managers.ensure_index("email", unique=True)
-            print("db.managers installed")
+            logging.info("db.managers installed")
             try:
                 user = masterdb.managers.find_one({"email": EMAIL})
                 if not user:
@@ -96,30 +97,30 @@
                     )
                     manager["orgid"] = 0
                     masterdb["managers"].insert(manager)
-                    print(
+                    logging.info(
                         "Admin user created, username: %s, password: %s"
                         % (EMAIL, DEFAULTPASSWORD)
                     )
             except Exception as ex:
-                print(("Failed to create admin user", ex))
+                logging.error(("Failed to create admin user", ex))
 
     except CollectionInvalid:
-        print("Failed to created managers collection")
+        logging.info("Failed to created managers collection")
         pass
 
     try:
         if not "options" in collection_names:
             masterdb.create_collection("options")
-            print("db.options installed")
+            logging.info("db.options installed")
             try:
                 version = masterdb["options"].find_one({"name": "version"})
                 if not version:
                     option_ver = {}
                     option_ver["name"] = "version"
                     option_ver["value"] = VERSION
                     masterdb["options"].insert(option_ver)
-                    print(("Version number written: %s" % VERSION))
+                    logging.info(("Version number written: %s" % VERSION))
             except Exception:
-                print("Failed to write version number")
+                logging.error("Failed to write version number")
     except CollectionInvalid:
-        print("db.options installed")
+        logging.error("db.options installed")

logging.ini-sample

@@ -1,5 +1,5 @@
 [loggers]
-keys=root,python_requests,tornado_access,tornado_application,tornado_general,push,apns,fcm
+keys=root,tornado_access,push,apns,fcm
 
 [logger_root]
 handlers=console
@@ -11,23 +11,6 @@ propagate=0
 handlers=accesslog
 qualname=tornado.access
 
-[logger_tornado_application]
-; tornado app logger
-propagate=0
-handlers=main
-qualname=tornado.application
-
-[logger_tornado_general]
-; tornado general logger
-propagate=0
-handlers=main
-qualname=tornado.general
-
-[logger_python_requests]
-propagate=0
-handlers=silent
-qualname=requests.*
-
 [logger_push]
 ; controller logger
 handlers=pushlog

pushservices/fcm.py

@@ -14,7 +14,8 @@
 
 
 class FCMException(Exception):
-    def __init__(self, error):
+    def __init__(self, response_statuscode, error):
+        self.response_statuscode = response_statuscode
         self.error = error
 
 
@@ -95,7 +96,7 @@ def process(self, **kwargs):
         token = kwargs["token"]
 
         if not token:
-            raise FCMException("token is required")
+            raise FCMException(400, "token is required")
 
         access_token_info = self.credentials.get_access_token()
         headers = {
@@ -109,6 +110,8 @@ def process(self, **kwargs):
 
         if response.status_code >= 400:
             jsonError = response.json()
-            _logger.error("fcm response code >= 400 %s", str(jsonError))
-            raise FCMException(jsonError["error"])
+            _logger.info("fcm response code is >= 400 %s" % jsonError)
+            raise FCMException(
+                400, jsonError["error"],
+            )
         return response

upgrade.py

@@ -165,11 +165,13 @@
             appname = app["shortname"]
             db = mongodb[appprefix + appname]
             indexes = [("created", DESCENDING)]
-            print(
+            logging.info(
                 ("Adding index to %s%s['tokens'].%s" % (appprefix, appname, "created"))
             )
             db["tokens"].create_index(indexes)
-            print(("Adding index to %s%s['logs'].%s" % (appprefix, appname, "created")))
+            logging.info(
+                ("Adding index to %s%s['logs'].%s" % (appprefix, appname, "created"))
+            )
             db["logs"].create_index(indexes)
 
         masterdb["options"].update_one(
@@ -216,7 +218,7 @@
         try:
             masterdb.managers.drop_index("user")
         except Exception as ex:
-            print(ex)
+            logging.error(ex)
 
         masterdb["options"].update_one(
             {"name": "version"}, {"$set": {"value": 20191117}}, upsert=True