[ipset] stfu

darcs-hash:20110804014053-ffbb2-02e453aae35c8f791bcf3a2cac8b3689949ae63f.gz
This commit is contained in:
Nicolas Dandrimont 2011-08-04 03:40:53 +02:00
parent 8178661c9e
commit 55ebe3cfc4

View file

@ -19,7 +19,6 @@ import sys
sys.path.append('/usr/scripts/gestion') sys.path.append('/usr/scripts/gestion')
sys.path.append('/usr/scripts/lc_ldap') sys.path.append('/usr/scripts/lc_ldap')
import syslog
import commands import commands
import lock import lock
@ -33,7 +32,6 @@ class IpsetError(Exception):
self.cmd=cmd self.cmd=cmd
self.err_code=err_code self.err_code=err_code
self.output=output self.output=output
syslog.syslog(syslog.LOG_ERR,"%s : status %s,%s" % (cmd,err_code,output))
def __str__(self): def __str__(self):
return "%s\n status : %s\n %s" % (self.cmd,self.err_code,self.output) return "%s\n status : %s\n %s" % (self.cmd,self.err_code,self.output)
@ -47,7 +45,6 @@ class Ipset(object):
def call(self,cmd,arg=''): def call(self,cmd,arg=''):
"""Appel système à ipset""" """Appel système à ipset"""
cmd_line="%s %s %s %s" % (self.ipset,cmd,self.set,arg) cmd_line="%s %s %s %s" % (self.ipset,cmd,self.set,arg)
syslog.syslog(syslog.LOG_INFO,"ipset: %s, %s" % (self.set,arg))
status,output=commands.getstatusoutput(cmd_line) status,output=commands.getstatusoutput(cmd_line)
if status: if status:
raise IpsetError(cmd_line,status,output) raise IpsetError(cmd_line,status,output)