crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[analyse] Print de debug qui traîne, et changement de la syntaxe des arguments.

Browse source 
* Le print permettait de vérifier que les arguments étaient bien fournis comme voulu.
 * Désormais, si on utilise --aid/cid/mac/ip, il faut fournir juste après l'argument une
 valeur.
This commit is contained in:
Pierre-Elliott Bécue 2014-06-19 10:09:30 +02:00
parent 7da7390665
commit ce471b0507
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
surveillance/analyse2.py
View file

@ -439,7 +439,6 @@ def pretty_header(args):
def self_call(args): def self_call(args):
args = ["/usr/scripts/surveillance/analyse2.py"] + args args = ["/usr/scripts/surveillance/analyse2.py"] + args
print args
subprocess.Popen(args, stdout=subprocess.PIPE) subprocess.Popen(args, stdout=subprocess.PIPE)
if __name__ == "__main__": if __name__ == "__main__":

2
surveillance/deconnexion.py
View file

@ -209,7 +209,7 @@ for elupload, eltype, elid in uploadeurs:
# On inscrit l'instance dans la table des avertis_hard # 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)) 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: except Exception as error:
sys.stderr.write("Blacklist de id=%s pour %s Mo échoué, %s\n" % (proprio.id(), elupload, error)) sys.stderr.write("Blacklist de id=%s pour %s Mo échoué, %s\n" % (proprio.id(), elupload, error))
continue continue