ciocore 8.1.0b3__py2.py3-none-any.whl → 8.1.0b4__py2.py3-none-any.whl

ciocore/VERSION

@@ -1 +1 @@
-8.1.0-beta.3
+8.1.0-beta.4

ciocore/auth/server.py

@@ -5,6 +5,7 @@ import json
 import mimetypes
 import select
 import time
+import logging
 
 try:
     import SocketServer as socketserver
@@ -68,7 +69,7 @@ class Handler(BaseHTTPRequestHandler):
 
     def do_GET(self):
         global __keep_running__
-        #  Handle arg string
+        # Handle arg string
         self._set_headers()
         url_args = parse.parse_qs(parse.urlsplit(self.path).query)
 
@@ -84,8 +85,8 @@ class Handler(BaseHTTPRequestHandler):
         self._write_credentials(credentials_dict)
         try:
             self.wfile.write(bytes(HTML, encoding="utf8"))
-        except:
-            self.wfile.write(HTML)
+        except TypeError:
+            self.wfile.write(HTML.encode('utf8'))
 
         __keep_running__ = False
         return
@@ -113,6 +114,25 @@ def run(server_class=HTTPServer, handler_class=Handler, port=8085, creds_file=No
     server_class.handle_request = retry_loop
     httpd = server_class(server_address, handler_class)
     httpd.timeout = REQUEST_TIMEOUT
-    timeout = time.time() + SESSION_TIMEOUT
-    while time.time() < timeout and __keep_running__:
-        httpd.handle_request()
+    
+    try:
+        timeout = time.time() + SESSION_TIMEOUT
+        while time.time() < timeout and __keep_running__:
+            httpd.handle_request()
+    except KeyboardInterrupt:
+        logging.info("Server interrupted by user.")
+    except Exception as e:
+        logging.error(f"An error occurred: {e}")
+    finally:
+        logging.info("Shutting down the server...")
+        httpd.server_close()
+
+
+def stop_server():
+    global __keep_running__
+    __keep_running__ = False
+
+
+# if __name__ == "__main__":
+#     logging.basicConfig(level=logging.INFO)
+#     run()

ciocore/uploader/_uploader.py

@@ -195,6 +195,13 @@ class MD5OutputWorker(worker.ThreadWorker):
                 # mark this task as done
                 self.mark_done()
 
+            except SystemExit:
+                logger.info("System exit received, performing cleanup.")
+                if self.batch:
+                    self.ship_batch()
+                self.thread_complete_counter.decrement()
+                break
+
             except Exception as exception:
                 logger.exception('CAUGHT EXCEPTION on job "%s" [%s]:\n', job, self)
 
@@ -206,7 +213,6 @@ class MD5OutputWorker(worker.ThreadWorker):
                 # exit the while loop to stop the thread
                 break
 
-
 class HttpBatchWorker(worker.ThreadWorker):
     """
     This worker receives a batched list of files (path, hash, size) and makes an batched http api

{ciocore-8.1.0b3.dist-info → ciocore-8.1.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.1.0b3
+Version: 8.1.0b4
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor
@@ -51,6 +51,8 @@ See [CONTRIBUTING](CONTRIBUTING.md)
 ## Changelog
 
 ## Unreleased: 
+*  8.1.0-beta.4
+  * Attempt fix to uploader and auth server.
 
 *  8.1.0-beta.2 
    *  Allow bar and fw slash as separators for package paths

{ciocore-8.1.0b3.dist-info → ciocore-8.1.0b4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ciocore/VERSION,sha256=2DRqOK9nMlSC11Nee86uSKsieXWZ1KvFlSNzs6gNdTs,12
+ciocore/VERSION,sha256=wZbbw3PM0skTJS2SUi6CqpU1-RYIflvlCschbWPpfic,12
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
 ciocore/api_client.py,sha256=LvxG1EfUte3NjLiuVqFUwP2iBRaUdaNSKt4wMu9Bajs,33508
 ciocore/cli.py,sha256=jZ1lOKQiUcrMhsVmD9SVmPMFwHtgDF4SaoAf2-PBS54,15449
@@ -20,13 +20,13 @@ ciocore/retry.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ciocore/validator.py,sha256=f_K7gxz122W_i5AxVx6dKhckOygl8TnmQiVj7tyX5zw,2344
 ciocore/worker.py,sha256=YnE0mGqkky9uxPMyDRmvdt1p1ER_GN39AeZPIGw6f4U,21832
 ciocore/auth/__init__.py,sha256=cdS-xZzMq41yXM5cz8sUlcYgo8CJYh8HcCCWmhbDgf0,606
-ciocore/auth/server.py,sha256=8btX9-EokUl6q55V8muDmEV2tvvbTBD0BHeWFbwkzUc,3892
+ciocore/auth/server.py,sha256=VdD9XjRpsS1DoNuApfpzcOBs2EHNwkY9v5BQ40YaiAo,4376
 ciocore/docsite/404.html,sha256=zUCnDe9r5yFZh8MXcTmzDaFyYBuRHz1gvuyJS2rYiTI,17207
 ciocore/docsite/index.html,sha256=xz215H_KHWBYI1HT7IRpAZ4d1ptUiO8Y4DlOmbEPgPk,20945
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
 ciocore/docsite/objects.inv,sha256=la6BNz_7lZoDCr3Nin1oAB7Y7DvIy4ZOKUvR-9hfwko,785
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=em4iu7zKmOkZgFbmMbI_E6t_BlR_viXFUAOuB44IrWY,127
+ciocore/docsite/sitemap.xml.gz,sha256=_BSMbv_Z0Hn1lvQUVeagljGREB9tQDPGn3_8NVGdSs0,127
 ciocore/docsite/apidoc/api_client/index.html,sha256=qXLzKggMPnORGOzywLCYVD2Lre1M_3y3dli8fdj3ulo,193119
 ciocore/docsite/apidoc/apidoc/index.html,sha256=KGsHBY6GBF380w338GfOIMWnwAyyLvw2i1RQFORdwlE,26171
 ciocore/docsite/apidoc/config/index.html,sha256=n3koKPRUza5-uHUt8hK8H8XyH6HG_U2CsGobdaN4KfY,72559
@@ -95,7 +95,7 @@ ciocore/downloader/perpetual_downloader.py,sha256=cD7lnBH75-c-ZVVPHZc1vSnDhgJOnG
 ciocore/downloader/registry.py,sha256=_JIOuqpWkJkgJGN33nt-DCvqN9Gw3xeFhzPq4RUxIoE,2903
 ciocore/downloader/reporter.py,sha256=p1NK9k6iQ-jt7lRvZR0xFz0cGb2yo8tQcjlvYKR9SWM,4501
 ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
-ciocore/uploader/_uploader.py,sha256=40nzqO5DuFi4sx31VvjWxZPNkrWsWqM9jtFVxs_-o3o,37479
+ciocore/uploader/_uploader.py,sha256=5CevtVocVv46Gk1F2RgkvrFKtOS15AhQnQYkejU9y70,37731
 ciocore/uploader/upload_stats/__init__.py,sha256=Lg1y4zq1i0cwc6Hh2K1TAQDYymLff49W-uIo1xjcvdI,5309
 ciocore/uploader/upload_stats/stats_formats.py,sha256=giNirtObU66VALWghPFSRhg3q_vw5MvESsnXhb_I3y8,2402
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -120,8 +120,8 @@ tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
 tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
 tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
-ciocore-8.1.0b3.dist-info/METADATA,sha256=2xTpGaHNdwWS50Z-TLAAokcROv9uxcY2Y_DD4-YwPKM,18644
-ciocore-8.1.0b3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-ciocore-8.1.0b3.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.1.0b3.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.1.0b3.dist-info/RECORD,,
+ciocore-8.1.0b4.dist-info/METADATA,sha256=hhSZGR2owfeu6ihKfW24bDGgm_NoNBbMAktVM5tTYO4,18705
+ciocore-8.1.0b4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+ciocore-8.1.0b4.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.1.0b4.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.1.0b4.dist-info/RECORD,,