浏览代码

Fehler in Protokollierung

gc-server3 5 月之前
父节点
当前提交
df86fcb1c6
共有 3 个文件被更改,包括 17 次插入9 次删除
  1. 1 1
      config/nasa_config.crypt
  2. 6 5
      nasa_upload.py
  3. 10 3
      nasa_workflow.py

+ 1 - 1
config/nasa_config.crypt

@@ -1 +1 @@
-gAAAAABnVrXRCuKVsIsPGDL2D2Q3GZ6A9O67nFqQJNKEfnjFxIctoPqaQtCwRxR6Yl1KWYKJxXXKuanAtjjoS6gPmBRtaUKyKhWlCf6SCtC9i4nLpLrP01dBfJVDESO4I9Er_oUxXEapT4XIWOtRrfp2xVrNr8KjlVFHcHRT8URk2gBMcnrYJzAuRwwuQDYnMsvKKENdhM_0uvM_fYxnsNYNcMR5CgPD1raYp3r3hP91A5DjC9MEH3s0U9TtRqqyDqnf40uF9i6MD0Z1OZAEZZbdC0-pceIRZklr78aPHhuNom0wusZGxqcP23zZ8Po9sDCb3wScF7anQQ3uF6MTfCGs-D2qyKeD2qML-Bo2krJjoSm9Jyy9MWRw8MjUkLZ-dPF9-ZxhglOICIbdvpSqL0xC-Wnq47VOnExVdZ995lV9_MPWSiheGRlIgieVDXq55Ck8-UJT1dKTwHIZDtO0Dnuda0n-zDhNuscCGdk5BomzX6H-Izi0FGXtUdAoUvB-zSClEvpNH6RM6owoALhB_uDMCseuFj2rqQAOvf5f1X0nTxy1snfCjjq5rs0OXHRB0WlkjdfKugJC
+gAAAAABnWYkBv0vURWyg90THKhFWwPjSsNqW0GGOsjil6-vh4ITJ0A0uQKzqXQdNjcGYHyZ_MOWt_6Xxk7fYbKm1xHojSTycU-B4mIJxqoOUUsl2-29eOKBDH2iP7N_qWMX3KCa1Lr45OLKPBnV839A1bxvIFmNRKmfHmXglY-H0dYLGXNOMKKUNVnK2N57iBeRrBOtsJNn-CWL-TVTuzAIog0xKqfjFrcmvfFos5oz09bknjhIyQa66FigZMc6n8vpeJE1B_dxKEk1ewYLT2-47yQWVeShBxO0cdRlzAg8V7s9vozvjtLzahcMEN-oHhve-1_tt92jtWIl-Iur4AHOT6mDV9I-mjt2S4ESnfzDOUHTX5gn6mZiUqJXql0z10m2w5iMIYck9gr181lSsHCJ2OrQPL7KkLjxEdAL5GDR3ZilRhyDcdTdd6aIdI-vhfOQjfA-Q2Pt8oMlSAXsWwfM3Oq5TkiVPknBnLcvpcaabQ9UO3c4UPKwpk5rRdSN5_SfFumAdMl8TD6w-u-FgMOug8whWCmaw_R93_2vw5m05mFepYF1E6q0VBhvoKEpcSJ-D3JE-P6Qs

+ 6 - 5
nasa_upload.py

@@ -17,7 +17,7 @@ def submit_data(config: dict[str, str], payload):
     try:
         return client.service.MeldeAfterSalesDaten(payload)
     except Exception as e:
-        logger.Error(e)
+        logger.error(e)
     return -1
 
 
@@ -25,7 +25,7 @@ def print_result(period: str, result: str, len_pos: int):
     print("Periode: " + period)
     if len_pos == result:
         print(f"Erfolgreich {result} Datensätze übertragen")
-        logger.Info(f"Erfolgreich {result} Datensätze übertragen")
+        logger.info(f"Erfolgreich {result} Datensätze übertragen")
         return
 
     print("Übertragung der Datensätze Fehlgeschlagen.")
@@ -33,14 +33,15 @@ def print_result(period: str, result: str, len_pos: int):
         print("Fehler! Es waren keine Datensätze vorhanden.")
     else:
         print(f"{len_pos - result} von {len_pos} Datensätzen nicht verarbeitet!")
-        logger.Error(f"{len_pos - result} von {len_pos} Datensätzen nicht verarbeitet!")
+        logger.error(f"{len_pos - result} von {len_pos} Datensätzen nicht verarbeitet!")
 
 
 def submit_changes(config):
-    for file in Path(config["export_dir"] + "/temp").glob("NASA_*.json"):
+    for file in Path(config["export_dir"]).glob("NASA_*.json"):
+        print("  " + file.name)
         payload = json.load(file.open("r"))
         period = payload["Jahr"] + payload["Monat"]
-        logger.Info("Periode: " + period)
+        logger.info("Periode: " + period)
         len_pos = len(payload["AfterSalesPositionen"])
         result = submit_data(config, payload)
         print_result(period, result, len_pos)

+ 10 - 3
nasa_workflow.py

@@ -5,8 +5,9 @@ from pathlib import Path
 
 from cryptography.fernet import Fernet
 
+from nasa_archive import archive_files
 from nasa_export import load_data
-from nasa_upload import archive_files, submit_changes
+from nasa_upload import submit_changes
 
 logging.basicConfig(filename="logs/nasa.log", level=logging.INFO)
 logger = logging.getLogger("nasa")
@@ -37,20 +38,26 @@ def export_all_periods(config) -> None:
     periods = [f"{prev}{x:02}" for x in range(1, 13)] + [f"{dt.year}{x:02}" for x in range(1, dt.month)]
 
     for period in periods:
+        print("  Periode: " + period)
         payload = load_data(config, "database", period)
         json.dump(
             payload,
-            open(f"export/NASA/temp/NASA_{config['client_id']}_{period}_{config['timestamp']}.json", "w"),
+            open(f"{config['export_dir']}/temp/NASA_{config['client_id']}_{period}_{config['timestamp']}.json", "w"),
             indent=2,
         )
 
 
 def main():
     config = get_config()
-    config["timestamp"] = datetime.now().strftime("%Y%m%d_%H%M%S")
+    dt = datetime.now()
+    config["timestamp"] = dt.strftime("%Y%m%d_%H%M%S")
+    print("Start: " + dt.strftime("%d.%m.%Y %H:%M:%S"))
     config["export_dir"] = str(Path.cwd() / "export" / "NASA")
+    print("Export")
     export_all_periods(config)
+    print("Archivierung")
     archive_files(config["export_dir"])
+    print("Upload")
     submit_changes(config)