Removed logzero

CHANGELOG.md

@@ -13,6 +13,7 @@
 ### Changed
 
 - Sort gallery listings with simple python sort.
+- Removed deprecated logzero dependency, switched to logging. Thanks @bdsoha for the implementation and note.
 
 ## [1.0.23] - 2022-11-09
 

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - 1.1.1.1
     volumes:
       # Enable for dev
-      - ./vscoffline/:/opt/vscoffline/:ro
+      #- ./vscoffline/:/opt/vscoffline/:ro
       - ./artifacts/:/artifacts/
     environment:
       - SYNCARGS=--sync
@@ -26,7 +26,7 @@ services:
       dockerfile: ./vscoffline/vscgallery/Dockerfile
     volumes:
       # Enable for dev
-      - ./vscoffline/:/opt/vscoffline/:ro
+      #- ./vscoffline/:/opt/vscoffline/:ro
       - ./artifacts/:/artifacts/
       # Enable for custom SSL certs
       #- ./vscoffline/vscgallery/ssl/:/opt/vscoffline/vscgallery/ssl # Enable for custom SSL certs

vscoffline/server.py

@@ -1,7 +1,7 @@
 import os, sys, time, json, glob
 import falcon
 from distutils.version import LooseVersion
-from logzero import logger as log
+import logging as log
 from wsgiref import simple_server
 from watchdog.observers.polling import PollingObserver
 from watchdog.events import FileSystemEventHandler
@@ -164,7 +164,7 @@ def process_loaded_extension(self, extension, extensiondir):
                 if "targetPlatform" in version:
                     targetPlatform = version['targetPlatform']
                     asseturi = vsc.URLROOT + os.path.join(extensiondir, version['version'], targetPlatform)
-                else:                    
+                else:
                     asseturi = vsc.URLROOT + os.path.join(extensiondir, version['version'])
 
                 version['assetUri'] = asseturi
@@ -427,5 +427,10 @@ def on_modified(self, event):
 application.add_static_route('/artifacts/', '/artifacts/')
 
 if __name__ == '__main__':
+    log.basicConfig(
+        format='[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d] %(message)s',
+        datefmt='%y%m%d %H:%M:%S',
+        level=log.DEBUG
+    )
     httpd = simple_server.make_server('0.0.0.0', 5000, application)
     httpd.serve_forever()

vscoffline/sync.py

@@ -6,14 +6,13 @@
 import pathlib
 import hashlib
 import uuid
-import logzero
 import logging
 import json
 import time
 import datetime
 from typing import List
 from platform import release
-from logzero import logger as log
+import logging as log
 from pytimeparse.timeparse import timeparse
 import vsc
 from distutils.dir_util import create_tree
@@ -675,16 +674,22 @@ def __repr__(self):
     config = parser.parse_args()
 
     if config.debug:
-        logzero.loglevel(logging.DEBUG)
+        loglevel = logging.DEBUG
     else:
-        logzero.loglevel(logging.INFO)
+        loglevel = logging.INFO
 
     if config.logfile:
         log_dir = os.path.dirname(os.path.abspath(config.logfile))
         if not os.path.exists(log_dir):
             raise FileNotFoundError(
                 f'Log directory does not exist at {log_dir}')
-        logzero.logfile(config.logfile, maxBytes=1000000, backupCount=3)
+        logging.basicConfig(filename=config.logfile, encoding='utf-8', level=loglevel)
+    else:
+        log.basicConfig(
+            format='[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d] %(message)s',
+            datefmt='%y%m%d %H:%M:%S',
+            level=loglevel
+        )
 
     config.artifactdir_installers = os.path.join(
         os.path.abspath(config.artifactdir), 'installers')

vscoffline/vsc.py

@@ -5,8 +5,7 @@
 import pathlib
 from enum import IntFlag
 from typing import Any, Dict, List, Union
-
-from logzero import logger as log
+import logging as log
 
 PLATFORMS = ["win32", "linux", "linux-deb", "linux-rpm", "darwin", "linux-snap", "server-linux"]
 ARCHITECTURES = ["", "x64"]

vscoffline/vscgallery/requirements.txt

@@ -1,4 +1,3 @@
-logzero
 requests
 falcon
 gunicorn

vscoffline/vscsync/requirements.txt

@@ -1,3 +1,2 @@
-logzero
 requests
 pytimeparse