Habe ueberfluessige Variabeln entfernt.
This commit is contained in:
1 parent
1409e6cf0e
commit
510cb54faa
4 files changed
+8
-11
No files matched your search
+5
-8
@@ -3,23 +3,22 @@ services:
|
||||
build: ./logic
|
||||
volumes:
|
||||
- ./logic/node-red-data:/data
|
||||
- ./shared_data:/data/results # Hier landen die JSON/SQLite Dateien
|
||||
- ./shared_data:/data/results
|
||||
- ./logic/scripts:/data/scripts
|
||||
environment:
|
||||
- TZ=Europe/Zurich
|
||||
- GROUPINFO_JSON_LNK_NAME=archivegroup_information.json
|
||||
- GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
|
||||
- NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
|
||||
- BEGIN_NAME_GROUPINFO_JSON_FILE=size_by_ownergroup_and_number_of_copies_
|
||||
- BEGIN_NAME_GROUPINFO_JSON_FILE_WITH_PATH=/data/size_by_ownergroup_and_number_of_copies_
|
||||
- JSON_CACHE_WITH_PATH=/data/results/json_cache.json
|
||||
- NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
|
||||
- ERROR_LOGFILE=/data/logs/get_new_groupinfo_error.log
|
||||
- JSON_CACHE=json_cache.json
|
||||
- JSON_CACHE_WITH_PATH=/data/json_cache.json
|
||||
- AD_SERVER=d.psi.ch
|
||||
- AD_SEARCH_BASE=DC=d,DC=psi,DC=ch
|
||||
- AD_USER=${AD_USER}
|
||||
- AD_PASSWORD=${AD_PASSWORD}
|
||||
- METABASE_API_KEY=${METABASE_API_KEY}
|
||||
# Ausfuehrungszeitpunkt fuer den Haupt-Workflow im Cron-Format
|
||||
- MAIN_WORKFLOW_CRON=0 6 * * *
|
||||
# Behalte size_by_ownergroup_and_number_of_copies_ Files juenger als CLEANUP_TIME Tage
|
||||
- CLEANUP_TIME=20
|
||||
# Ausfuehrungszeitpunkt fuer den Cleanup im Cron-Format (Minuten Stunden * * *)
|
||||
@@ -28,8 +27,6 @@ services:
|
||||
- CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
|
||||
# Pfad zum Logfile des Cleanup-Skripts
|
||||
- CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
|
||||
# Ausfuehrungszeitpunkt fuer den Haupt-Workflow im Cron-Format
|
||||
- MAIN_WORKFLOW_CRON=0 6 * * *
|
||||
ports:
|
||||
- "1880:1880"
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
size_by_ownergroup_and_number_of_copies_2026-06-26T09_03_35.json
|
||||
size_by_ownergroup_and_number_of_copies_2026-06-26T11_00_16.json
|
||||
@@ -530,7 +530,7 @@
|
||||
"type": "file",
|
||||
"z": "f6f2187d.f17ca8",
|
||||
"name": "Write the new JSON object to cache",
|
||||
"filename": "\"/data/results/\" & $env(\"JSON_CACHE\")",
|
||||
"filename": "$env(\"JSON_CACHE_WITH_PATH\")",
|
||||
"filenameType": "jsonata",
|
||||
"appendNewline": true,
|
||||
"createDir": false,
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
[{"ownerGroup": "p20272", "copies": "oneCopyBig", "size": "1.863681336141E12", "packedSize": "1.86389970944E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22359", "copies": "oneCopySmall", "size": "5919447", "packedSize": "6092800", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p10017", "copies": "twoCopiesBig", "size": "1821246696", "packedSize": "1821573120", "beamline": "X06SA", "department": "6000"}, {"ownerGroup": "p21015", "copies": "oneCopyBig", "size": "8313245185", "packedSize": "8313989120", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p16643", "copies": "twoCopiesBig", "size": "1.7860300714773E13", "packedSize": "1.786030138368E13", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p10097", "copies": "oneCopyBig", "size": "1413939840", "packedSize": "1414440960", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p21860", "copies": "oneCopyBig", "size": "2606238982", "packedSize": "2672721920", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p23473", "copies": "oneCopySmall", "size": "817273", "packedSize": "962560", "beamline": "EIGER", "department": "3000"}, {"ownerGroup": "p16482", "copies": "oneCopyBig", "size": "2.9413118577E10", "packedSize": "2.941382656E10", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p18998", "copies": "oneCopyBig", "size": "5618437120", "packedSize": "5624801280", "beamline": "dolly", "department": "3000"}, {"ownerGroup": "p21884", "copies": "oneCopySmall", "size": "370299", "packedSize": "552960", "beamline": "ZEBRA", "department": "3000"}, {"ownerGroup": "p19329", "copies": "oneCopyBig", "size": "1244720517", "packedSize": "1247211520", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p16659", "copies": "twoCopiesBig", "size": "9.17772558955E11", "packedSize": "9.1777263616E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p17651", "copies": "oneCopySmall", "size": "302583", "packedSize": "399360", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p22031", "copies": "oneCopyBig", "size": "2606775722", "packedSize": "2608332800", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p16235", "copies": "oneCopyBig", "size": "1.04522802465E11", "packedSize": "1.0452401152E11", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p21020", "copies": "oneCopyBig", "size": "3322782491", "packedSize": "3325184000", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p21950", "copies": "oneCopyBig", "size": "25428340520", "packedSize": "25442785280", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p10784", "copies": "oneCopyBig", "size": "1.59439468554E11", "packedSize": "1.59475968E11", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "a-35569", "copies": "twoCopiesSmall", "size": "8419", "packedSize": "10240", "department": "4000"}, {"ownerGroup": "p12138", "copies": "twoCopiesBig", "size": "1.003602750317E12", "packedSize": "1.00360170496E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p21735", "copies": "oneCopyBig", "size": "3.631050727373E12", "packedSize": "3.63110034432E12", "beamline": "SARESC", "department": "6000"}, {"ownerGroup": "p22257", "copies": "oneCopySmall", "size": "178779", "packedSize": "266240", "beamline": "EIGER", "department": "3000"}, {"ownerGroup": "p17604", "copies": "twoCopiesBig", "size": "3.823001795927E12", "packedSize": "3.82374298624E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p18185", "copies": "oneCopyBig", "size": "6.859414332551E12", "packedSize": "6.85943474176E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19468", "copies": "oneCopyBig", "size": "23184486455", "packedSize": "23185397760", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p20089", "copies": "oneCopyBig", "size": "1.085014290009E12", "packedSize": "1.08501582848E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "a-41609", "copies": "oneCopyBig", "size": "1.9260685201E11", "packedSize": "1.9273683968E11", "department": "6000"}, {"ownerGroup": "p22809", "copies": "oneCopyBig", "size": "4731994868", "packedSize": "4734945280", "beamline": "flame", "department": "3000"}, {"ownerGroup": "p11567", "copies": "twoCopiesBig", "size": "2.431656817347E12", "packedSize": "2.43164803072E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22815", "copies": "oneCopyBig", "size": "9046463478", "packedSize": "9047029760", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p10923", "copies": "twoCopiesBig", "size": "6.86984398832E11", "packedSize": "6.8698466304E11", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22325", "copies": "oneCopyBig", "size": "32531717", "packedSize": "33720320", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p21902", "copies": "oneCopySmall", "size": "131823", "packedSize": "184320", "beamline": "TASP", "department": "3000"}, {"ownerGroup": "p20134", "copies": "oneCopyLine truncated
|
||||
[{"ownerGroup": "p22908", "copies": "oneCopyBig", "size": "573050042", "packedSize": "574361600", "beamline": "DMC", "department": "3000"}, {"ownerGroup": "p21110", "copies": "oneCopySmall", "size": "40768", "packedSize": "61440", "beamline": "X04DB", "department": "6000"}, {"ownerGroup": "p22690", "copies": "oneCopySmall", "size": "1275368", "packedSize": "1331200", "beamline": "HRPT", "department": "3000"}, {"ownerGroup": "p18662", "copies": "oneCopyBig", "size": "3.1852200838E11", "packedSize": "3.1851830272E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p12689", "copies": "oneCopyBig", "size": "1322701365", "packedSize": "1340160000", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "a-35479", "copies": "oneCopyBig", "size": "1.30380466929E11", "packedSize": "1.3038057472E11", "department": "4000"}, {"ownerGroup": "p19837", "copies": "oneCopyBig", "size": "4043130334", "packedSize": "4045742080", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p20458", "copies": "oneCopyBig", "size": "369327751", "packedSize": "369438720", "beamline": "gps", "department": "3000"}, {"ownerGroup": "p17654", "copies": "oneCopySmall", "size": "16377159", "packedSize": "16517120", "beamline": "X04SA", "department": "6000"}, {"ownerGroup": "p19415", "copies": "oneCopyBig", "size": "20054173130", "packedSize": "20056012800", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p22673", "copies": "oneCopyBig", "size": "574986081", "packedSize": "575406080", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p20625", "copies": "oneCopyBig", "size": "3.956889170956E12", "packedSize": "3.95711947776E12", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p12912", "copies": "twoCopiesBig", "size": "1.001684514507E12", "packedSize": "1.00168336384E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p19743", "copies": "oneCopyBig", "size": "2.38144181607E11", "packedSize": "2.3815064576E11", "beamline": "SATESE", "department": "6000"}, {"ownerGroup": "p21147", "copies": "oneCopyBig", "size": "1.3097894666764E13", "packedSize": "1.309792879616E13", "beamline": "SARESC", "department": "6000"}, {"ownerGroup": "p22812", "copies": "oneCopyBig", "size": "8283184251", "packedSize": "8283781120", "beamline": "lem", "department": "3000"}, {"ownerGroup": "p18713", "copies": "oneCopySmall", "size": "32166531", "packedSize": "38369280", "beamline": "SARESB", "department": "6000"}, {"ownerGroup": "p22100", "copies": "oneCopyBig", "size": "81414252", "packedSize": "81571840", "beamline": "CAMEA", "department": "3000"}, {"ownerGroup": "p22886", "copies": "oneCopyBig", "size": "1011223", "packedSize": "1198080", "beamline": "EIGER", "department": "3000"}, {"ownerGroup": "p22051", "copies": "oneCopyBig", "size": "5040878725", "packedSize": "5045678080", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p17484", "copies": "oneCopyBig", "size": "1998038021", "packedSize": "2004316160", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p22122", "copies": "oneCopyBig", "size": "543274871", "packedSize": "543477760", "beamline": "FOCUS", "department": "3000"}, {"ownerGroup": "p21625", "copies": "oneCopySmall", "size": "14926", "packedSize": "30720", "beamline": "SATESE", "department": "6000"}, {"ownerGroup": "p15935", "copies": "oneCopyBig", "size": "554783908", "packedSize": "555622400", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p14820", "copies": "oneCopyBig", "size": "1014442", "packedSize": "1034240", "beamline": "X05LA", "department": "6000"}, {"ownerGroup": "p20628", "copies": "oneCopyBig", "size": "2.32076737617E11", "packedSize": "2.3210779648E11", "beamline": "X12SA", "department": "6000"}, {"ownerGroup": "p19029", "copies": "oneCopyBig", "size": "1651880180", "packedSize": "1653166080", "beamline": "gpd", "department": "3000"}, {"ownerGroup": "p12952", "copies": "oneCopyBig", "size": "520650914", "packedSize": "522946560", "beamline": "X11MA", "department": "6000"}, {"ownerGroup": "p17134", "copies": "oneCopyBig", "size": "5.0418662889E10", "packedSize": "5.043016704E10", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p17135", "copies": "oneCopyBig", "size": "4155681877", "packedSize": "4161986560", "beamline": "X09LA", "department": "6000"}, {"ownerGroup": "p12469", "copies": "twoCopiesBig", "size": "6.176167839275E12", "packedSize": "6.17614362624E12", "beamline": "X02DA", "department": "6000"}, {"ownerGroup": "p22107", "copies": "oneCopyBig", "size": "65533646", "packedSize": "66242560", "beamline": "DMC", "department": "3000"}, {"ownerGroup": "p16343", "copies": "oneCopyBig", "size": "1.122470071358E12", "packedSize": "1.1224698368E12", "beamline": "X08SA", "department": "6000"}, {"ownerGroup": "p21864", "copies": "oneCopyBig", "size": "475200929", "packedSize": "484904960", "beamline": "SANS-I", "department": "3000"}, {"ownerGroup": "p18777", "copies": "oneCopyBig", "size": "9.0421141620551E13", "packedSize": "9.042114Line truncated
|
||||
|
||||
Reference in new issue
Block a user