diff --git a/surveillance/analyse2.py b/surveillance/analyse2.py index 12c75587..e01861b6 100755 --- a/surveillance/analyse2.py +++ b/surveillance/analyse2.py @@ -439,7 +439,6 @@ def pretty_header(args): def self_call(args): args = ["/usr/scripts/surveillance/analyse2.py"] + args - print args subprocess.Popen(args, stdout=subprocess.PIPE) if __name__ == "__main__": diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index 17db0b5f..7bc7e048 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -209,7 +209,7 @@ for elupload, eltype, elid in uploadeurs: # On inscrit l'instance dans la table des avertis_hard ###################################################### curseur.execute("INSERT INTO avertis_upload_hard (type,id,date) VALUES ('%s','%d','now')"%(eltype,elid)) - analyse.self_call(["--%s" % (self_call_type), "%s" % (elid), "--begin", "%s" % (orig), "--end", "%s" % (end), "--limit", "1000", "--fichier", "/usr/scripts/var/analyse/%s_%s_%s.txt" % (end.replace("/", "_").replace(":", "_").replace(" ", "_"), self_call_type, elid)]) + analyse.self_call(["--%s" % (self_call_type), "%s" % (elid), "--dns", "--begin", "%s" % (orig), "--end", "%s" % (end), "--limit", "1000", "--fichier", "/usr/scripts/var/analyse/%s_%s_%s.txt" % (end.replace("/", "_").replace(":", "_").replace(" ", "_"), self_call_type, elid)]) except Exception as error: sys.stderr.write("Blacklist de id=%s pour %s Mo échoué, %s\n" % (proprio.id(), elupload, error)) continue