Compare commits

9 Commits

Author SHA1 Message Date
2f8163f0f5 Failed arg 2024-05-05 23:47:56 +02:00
d4e7d822a9 Failed arg 2024-05-05 23:43:39 +02:00
3303730513 Failed arg 2024-05-05 23:40:45 +02:00
a490365265 Deleted prints 2024-05-05 21:54:06 +02:00
92364e261a Send message when host is available 2024-05-05 21:36:42 +02:00
65ba36b439 Merge pull request 'statusFeature' (#2) from statusFeature into main
Reviewed-on: #2
2024-05-05 21:29:48 +02:00
9355d9b2de Test Jenkinsfile
All checks were successful
Gitea/Status/pipeline/head This commit looks good
2024-05-05 19:58:01 +02:00
dc9c7eabc6 Merge branch 'main' of ssh://gitssh.mainserverprivate.org:8222/vgallegoiz/Status 2024-05-05 19:51:48 +02:00
e976c48103 Test Jenkinsfile 2024-05-05 19:51:29 +02:00
2 changed files with 16 additions and 12 deletions

10
Jenkinsfile vendored Normal file
View File

@@ -0,0 +1,10 @@
pipeline {
agent any
stages {
stage("Hello") {
steps {
echo "Hello world"
}
}
}
}

View File

@@ -17,7 +17,7 @@ def parseArguments():
parser = argparse.ArgumentParser(description='Ejemplo de script con flags') parser = argparse.ArgumentParser(description='Ejemplo de script con flags')
# Agregar los argumentos con sus respectivos flags # Agregar los argumentos con sus respectivos flags
parser.add_argument('-W', '--web', action='store', dest='web', help='Indicar un archivo con lista de Webs') parser.add_argument('-F', '--fail', action='store', dest='failed', help='Indicar un archivo con lista de Fails')
parser.add_argument('-H', '--host', action='store', dest='host', help='Indicar un archivo con lista de hosts') parser.add_argument('-H', '--host', action='store', dest='host', help='Indicar un archivo con lista de hosts')
try: try:
@@ -25,7 +25,7 @@ def parseArguments():
return parser.parse_args() return parser.parse_args()
except argparse.ArgumentError as e: except argparse.ArgumentError as e:
# Si ocurre un error al analizar los argumentos, mostrar un mensaje de error # Si ocurre un error al analizar los argumentos, mostrar un mensaje de error
print("Error:", e) #print("Error:", e)
# Mostrar el mensaje de ayuda # Mostrar el mensaje de ayuda
parser.print_help() parser.print_help()
exit() exit()
@@ -37,7 +37,7 @@ def toIP(hosts):
ip = ipaddress.IPv4Address(host) ip = ipaddress.IPv4Address(host)
ips.add(ip) ips.add(ip)
except ipaddress.AddressValueError: except ipaddress.AddressValueError:
print(f"La entrada '{host}' no es una dirección IP válida.") logging.info(f"La entrada '{host}' no es una dirección IP válida.")
return ips return ips
def check_ping(hosts, fails): def check_ping(hosts, fails):
@@ -53,15 +53,14 @@ def check_ping(hosts, fails):
elif response.success(): elif response.success():
if host in fails: if host in fails:
fails.remove(host) fails.remove(host)
send_discord_message(f"{host} disponible de nuevo")
logging.info(f"Ping correct: {host}") logging.info(f"Ping correct: {host}")
except Exception as e: except Exception as e:
logging.info(f"Bad ping: {host}") logging.info(f"Bad ping: {host}")
print(e)
print(fails)
save_status(fails) save_status(fails)
def save_status(fails): def save_status(fails):
with open("failed.txt", "w") as file: with open(args.failed, "w") as file:
for fail in fails: for fail in fails:
file.write(str(fail) + "\n") file.write(str(fail) + "\n")
file.close file.close
@@ -74,7 +73,6 @@ def send_discord_message(message):
response = requests.post(DISCORD_WEBHOOK_URL, json=data) response = requests.post(DISCORD_WEBHOOK_URL, json=data)
response.raise_for_status() response.raise_for_status()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
print(f"Error sending Discord message: {e}")
logging.info(f"Error sending Discord message: {e}") logging.info(f"Error sending Discord message: {e}")
else: else:
logging.info("Discord message sent successfully!") logging.info("Discord message sent successfully!")
@@ -85,9 +83,5 @@ if __name__ == '__main__':
fails = set() fails = set()
if args.host: if args.host:
ips_and_hosts.update(toIP(read_document(args.host))) ips_and_hosts.update(toIP(read_document(args.host)))
fails.update(toIP(read_document("failed.txt"))) fails.update(toIP(read_document(args.failed)))
if args.web:
print("Hay webs")
# Parsear correctamente
# ips_and_hosts.update()
check_ping(ips_and_hosts, fails) check_ping(ips_and_hosts, fails)