imported by:
-
create_service
- •
importlib._common
+
importlib._common
•
importlib.metadata
•
requests.utils
•
shutil
diff --git a/dist/VOLUME_CHECK.exe b/dist/VOLUME_CHECK.exe
index df7cd15..6ab95ab 100644
Binary files a/dist/VOLUME_CHECK.exe and b/dist/VOLUME_CHECK.exe differ
diff --git a/dist/zls_check.txt b/dist/zls_check.txt
new file mode 100644
index 0000000..9233c01
--- /dev/null
+++ b/dist/zls_check.txt
@@ -0,0 +1 @@
+Volume not Found 2023-09-13 15:24:40.125231 - User: Sebastian Serfling
diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..0611260
--- /dev/null
+++ b/log.txt
@@ -0,0 +1,6 @@
+13.09.2023 14:39 - Sebastian Serfling has no access to X: \\172.19.1.3\deployment
+Keine Netvolume vorhanden!
+Keine Netvolume vorhanden!
+Keine Netvolume vorhanden!
+Keine Netvolume vorhanden!
+Keine Netvolume vorhanden!
diff --git a/main.py b/main.py
index a5ca065..c31f1b8 100644
--- a/main.py
+++ b/main.py
@@ -4,12 +4,9 @@ import requests
import time
import socket
import datetime
-import create_service
import system_info
import volume
-create_service.addservice("VOLUME_CHECK") ## CREATE VOLUME
-
def request(function,variable): ##API-SErver
url = (f"http://api.stines.de:8001/{function}")
response = requests.post(url,json = variable,headers={'access_token':'^YWUbG7yX*V!tV^KBSd*2c&vdN3wV9a2i7f3hfGFMBYFxi6#mMiJGiaA5KEHE%B*miK%qb7rQ67gmcYP@gqmux8'})
@@ -25,12 +22,18 @@ def check_volume_exist():
user = os.getlogin() ## GET CURRENT USER
database = request("info/getclient",{"name":hostname}).text.replace('"',"") ##GET DATABASE FROM SQL-SERVER
volume_get = request("info/getvolume",{"name":hostname,"database":database}) ##GET VOLUMES FROM SQL-SERVER
+ print(volume_get.text)
space_free = str(system_info.get_single_hdd("free")).replace("['","").replace("]","").replace("'","").replace(",",";") ## FREE SPACE OF VOLUME
space_used = str(system_info.get_single_hdd("used")).replace("['","").replace("]","").replace("'","").replace(",",";") ## USED SPACE OF VOLUME
space_total = str(system_info.get_single_hdd("total")).replace("['","").replace("]","").replace("'","").replace(",",";") ## TOTAL SPACE OF VOLUME
if volume_get.text == "false":
+ print(volume.get_netvolume())
+ if volume.get_netvolume() is None:
+ with open("log.txt", "a") as datei:
+ datei.writelines(f"Keine Netvolume vorhanden!" + "\n") ## WRITE TO ERRORLOG
+ pushover_send("Keine Netvolume vorhanden!", hostname) ## SEND ERROR LOG TO PUSHOVER
netvolume = volume.get_netvolume()
values = (
f"'{hostname}','{system_info.get_local_ip()}','{system_info.get_winver()}','{system_info.get_cpu_brand()}','{system_info.get_cpu_core()}','{system_info.get_ram_info()}','{space_total}','{space_free}','{space_used}'")
diff --git a/volume.py b/volume.py
index 00a90af..36ebfca 100644
--- a/volume.py
+++ b/volume.py
@@ -9,17 +9,29 @@ def get_netvolume():
"Select-Object DeviceID,ProviderName | "
"ConvertTo-Json"
)
-
+ volume_count = ("(Get-CimInstance -ClassName Win32_LogicalDisk | Where-Object -Property DriveType -EQ 4).Count")
# PowerShell-Befehl ausführen und das Ergebnis in eine Python-Variable laden
result = subprocess.run(
["powershell", "-Command", powershell_command],
capture_output=True,
text=True
)
-
- # Die Ausgabe als JSON interpretieren und in ein Python-Array laden
- net_drives = json.loads(result.stdout)
+ volume_count_result = subprocess.run (
+ ["powershell", "-Command", volume_count],
+ capture_output=True,
+ text=True
+ )
volumes = []
- for i in net_drives:
- volumes.append(f"{i['DeviceID']};{i['ProviderName']}")
- return volumes
\ No newline at end of file
+ if result.stdout != '':
+ net_drives = json.loads(result.stdout)
+ else:
+ return None
+ if volume_count_result.stdout != '':
+ for i in net_drives:
+ volumes.append(f"{i['DeviceID']};{i['ProviderName']}")
+ return volumes
+ else:
+ volumes.append(f"{net_drives['DeviceID'][0]};{net_drives['ProviderName']}")
+ return volumes
+ # Die Ausgabe alvolumess JSON interpretieren und in ein Python-Array laden
+print(get_netvolume())
\ No newline at end of file