upload works, tracking does not

Author: simsong

dbutil.py

@@ -6,6 +6,7 @@
 from deploy.app import dbmaint
 from deploy.app import db
 from deploy.app import dbfile
+from deploy.app import paths
 
 
 if __name__ == "__main__":
@@ -40,7 +41,7 @@
     parser.add_argument("--report",help="Print a report of the database",action='store_true')
     parser.add_argument("--freshen",help="Non-destructive cleans up the movie metadata for all movies.",action='store_true')
     parser.add_argument("--clean",help="Destructive cleans up the movie metadata for all movies.",action='store_true')
-    parser.add_argument("--schema", help="Specify schema file to use", default=dbmaint.SCHEMA_FILE)
+    parser.add_argument("--schema", help="Specify schema file to use", default=paths.SCHEMA_FILE)
     parser.add_argument("--dump", help="Backup all objects as JSON files and movie files to new directory called DUMP.  ")
     parser.add_argument("--add_admin", help="Add --admin_email user as a course admin to the course specified by --course_id, --course_name, or --course_name", action='store_true')
     parser.add_argument("--course_id", help="integer course id", type=int)

deploy/app/bottle_api.py

@@ -267,9 +267,8 @@ def api_upload_movie():
     :param: key    - where the file gets uploaded -from api_new_movie()
     :param: request.files['file'] - the file!
     """
-    print("HELLO",file=sys.stderr)
-    current_app.logger.info("info")
-    current_app.logger.error("error")
+    logging.info("info")
+    logging.error("error")
     scheme = get('scheme')
     key = get('key')
     movie_data_sha256 = get('sha256') # claimed SHA256
@@ -597,7 +596,7 @@ def api_ver():
     """Report the python version. Allows us to validate we are using Python3.
     Run the dictionary below through the VERSION_TEAMPLTE with jinja2.
     """
-    logging.debug("api_ver")
+    current_app.logger.error("api_ver")
     return {'__version__': __version__, 'sys_version': sys.version}
 
 ################################################################

deploy/app/bottle_app.py

@@ -11,6 +11,7 @@
 from logging.config import dictConfig
 
 from flask import Flask, request, render_template, jsonify, make_response
+from flask.logging import default_handler
 
 # Bottle creates a large number of no-member errors, so we just remove the warning
 # pylint: disable=no-member
@@ -45,14 +46,18 @@ def lambda_startup():
     clogging.setup(level=os.environ.get('PLANTTRACER_LOG_LEVEL',logging.INFO))
     fix_boto_log_level()
 
+    logging.info("p1")
     if os.environ.get(C.PLANTTRACER_S3_BUCKET,None):
         db_object.S3_BUCKET = os.environ[C.PLANTTRACER_S3_BUCKET]
+        logging.info("p2a %s",db_object.S3_BUCKET)
     else:
         config = auth.config()
         try:
             db_object.S3_BUCKET = config['s3']['s3_bucket']
+            logging.info("p2b %s",db_object.S3_BUCKET)
         except KeyError as e:
             logging.info("s3_bucket not defined in config file. using db object store instead. %s",e)
+    logging.info("p3 %s",db_object.S3_BUCKET)
 
 ################################################################
 ## API SUPPORT
@@ -62,22 +67,19 @@ def lambda_startup():
     'formatters': {'default': {
         'format': '[%(asctime)s] [%(process)d] %(levelname)s %(filename)s:%(lineno)d %(message)s',
     }},
-    'handlers': {'wsgi': {
-        'class': 'logging.StreamHandler',
-        'stream': 'ext://flask.logging.wsgi_errors_stream',
-        'formatter': 'default'
-    }},
     'root': {
         'level': 'DEBUG',
-        'handlers': ['wsgi']
     }
 })
 
+fix_boto_log_level()
+lambda_startup()
 app = Flask(__name__)
 app.register_blueprint(api_bp, url_prefix='/api')
-root = logging.getLogger()
-fix_boto_log_level()
-app.logger.info("Application logging is configured.  __name__=%s",__name__)
+app.logger.info("new Flask(__name__=%s)",__name__)
+app.logger.info("PLANTTRACER_CREDENTIALS=%s",os.environ.get(C.PLANTTRACER_CREDENTIALS,None))
+app.logger.info("db_object.S3_BUCKET=%s",db_object.S3_BUCKET)
+logging.info("regular logging works too")
 
 
 ################################################################
@@ -212,6 +214,7 @@ def func_ver():
     """Demo for reporting python version. Allows us to validate we are using Python3.
     Run the dictionary below through the VERSION_TEAMPLTE with jinja2.
     """
+    logging.info("/ver")
     response = make_response(render_template('version.txt',
                                              __version__=__version__,
                                              sys_version= sys.version))

deploy/app/db_object.py

@@ -134,7 +134,7 @@ def read_signed_url(*,urn,sig):
     logging.error("URL signature does not match. urn=%s sig=%s computed_sig=%s",urn,sig,computed_sig)
     raise AuthError("signature does not verify")
 
-def make_presigned_post(*, urn, maxsize=10_000_000, mime_type='video/mp4',expires=3600, sha256=None):
+def make_presigned_post(*, urn, maxsize=C.MAX_FILE_UPLOAD, mime_type='video/mp4',expires=3600, sha256=None):
     """Returns a dictionary with 'url' and 'fields'"""
     o = urllib.parse.urlparse(urn)
     if o.scheme==C.SCHEME_S3: