about summary refs log tree commit diff
path: root/scripts/rqtl2/entry.py
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2025-05-12 11:16:55 -0500
committerFrederick Muriuki Muriithi2025-05-12 11:18:01 -0500
commit7396f426041d72f99b1dc32101e187e4375056df (patch)
treee45001ee2893502a80883edaf511083152c09807 /scripts/rqtl2/entry.py
parent06a3658b94d78296797b9f2af2d12d73f2c54932 (diff)
downloadgn-uploader-7396f426041d72f99b1dc32101e187e4375056df.tar.gz
Pass in the logger, rather than the name of the logger.
Diffstat (limited to 'scripts/rqtl2/entry.py')
-rw-r--r--scripts/rqtl2/entry.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/rqtl2/entry.py b/scripts/rqtl2/entry.py
index e837aa8..e0e00e7 100644
--- a/scripts/rqtl2/entry.py
+++ b/scripts/rqtl2/entry.py
@@ -20,18 +20,13 @@ def build_main(
             [Redis, Connection, str, Namespace, logging.Logger],
             int
         ],
-        loggername: str
+        logger: logging.Logger
 ) -> Callable[[],int]:
     """Build a function to be used as an entry-point for scripts."""
     def main():
-            logging.basicConfig(
-                format=(
-                    "%(asctime)s - %(levelname)s %(name)s: "
-                    "(%(pathname)s: %(lineno)d) %(message)s"),
-                level=args.loglevel)
-            logger = logging.getLogger(loggername)
         with (Redis.from_url(args.redisuri, decode_responses=True) as rconn,
               database_connection(args.databaseuri) as dbconn):
+            logger.setLevel(args.loglevel.upper())
             fqjobid = jobs.job_key(args.redisprefix, args.jobid)
 
             try:
@@ -41,7 +36,7 @@ def build_main(
                     fqjobid,
                     f"{fqjobid}:log-messages",
                     args.redisexpiry))
-                logger.addHandler(StreamHandler(stream=sys.stdout))
+                logger.addHandler(StreamHandler(stream=sys.stderr))
 
                 check_db(args.databaseuri)
                 check_redis(args.redisuri)
@@ -49,7 +44,7 @@ def build_main(
                     logger.error("File not found: '%s'.", args.rqtl2bundle)
                     return 2
 
-                returncode = run_fn(rconn, dbconn, fqjobid, args, logger)
+                returncode = run_fn(rconn, dbconn, fqjobid, args)
                 if returncode == 0:
                     rconn.hset(fqjobid, "status", "completed:success")
                     return returncode