Versão que grava atributos e contdor. Primeiro beta que vai pra produção.

Eduardo Santos · Eduardo Santos
2 parents e998ced2 7352198e
Showing 3 changed files with 39 additions and 10 deletions Show diff stats
cocar/commands/scan_commands.py
cocar/model/printer.py
cocar/session.py
@@ -62,6 +62,12 @@ class ScanCommands(command.Command):
                       help='SNMP query to execute'
     )
+    parser.add_option('-t', '--timeout',
+                      action='store',
+                      dest='timeout',
+                      help='Timeout da consulta SNMP'
+    )
+
     def __init__(self, name):
         """
         Constructor method
@@ -249,6 +255,7 @@ class ScanCommands(command.Command):
                         log.info("Host genérico com o IP %s já cadastrado", hostname)
                 #session.flush()
+            session.close()
     def get_printers(self):
         """
@@ -272,7 +279,8 @@ class ScanCommands(command.Command):
             log.info("Coletando informacoes da impressora %s", printer.network_ip)
             #printer.network_ip = printer.ip_network
             snmp_session = SnmpSession(
-                DestHost=printer.network_ip
+                DestHost=printer.network_ip,
+                Timeout=self.options.timeout
             )
             if snmp_session is None:
                 log.error("Erro na coleta SNMP da impressora %s", printer.network_ip)
@@ -347,6 +355,8 @@ class ScanCommands(command.Command):
             log.info("Exportando impressora %s", printer.network_ip)
             printer.export_printer(server_url=self.cocar.config.get('cocar', 'server_url'), session=session)
+        session.close()
+
     def get_printer_attribute(self):
         """
         Retorna e grava um atributo n   o valor da impressora
@@ -363,16 +373,22 @@ class ScanCommands(command.Command):
                 Printer.network_ip == self.options.hosts
             ).all()
+        if len(results) == 0:
+            log.error("Impressoras não encontradas")
+            log.error(self.options.hosts)
+
         for printer in results:
             log.info("Coletando informacoes da impressora %s", printer.network_ip)
             #printer.network_ip = printer.ip_network
             snmp_session = SnmpSession(
-                DestHost=printer.network_ip
+                DestHost=printer.network_ip,
+                Timeout=self.options.timeout
             )
             if snmp_session is None:
                 log.error("Erro na coleta SNMP da impressora %s", printer.network_ip)
                 continue
             else:
+                log.info("Iniciando coleta da impressora %s", printer.network_ip)
                 printer_dict = dict()
                 if type(self.options.query != list):
                     test = self.options.query
@@ -448,6 +464,8 @@ class ScanCommands(command.Command):
                     log.error("Erro na atualizacao das informacoes para a impressora %s\n%s", printer.network_ip, e.message)
                     continue
+        session.close()
+
 def make_query(host):
     """This does the actual snmp query
@@ -53,6 +53,7 @@ class Printer(Host):
         ).all()
         for counter in counter_list:
+            print(counter)
             result = counter.export_counter(server_url, session)
             if result:
                 log.info("Contador %s para a impressora %s exportado com sucesso")
@@ -88,6 +89,7 @@ class PrinterCounter(Printer):
         :param session: SQLAlchemy session
         :return boolean: True if inserted
         """
+        retorno = False
         results = session.query(self.__table__).filter(
             and_(
                 self.__table__.c.counter == self.counter,
@@ -104,7 +106,7 @@ class PrinterCounter(Printer):
                     counter_time=self.counter_time
                 )
             )
-            return True
+            retorno = True
         session.execute(
             Printer.__table__.update().values(
@@ -117,7 +119,7 @@ class PrinterCounter(Printer):
         )
         session.flush()
-        return False
+        return retorno
     def export_counter(self, server_url, session):
         """
@@ -139,7 +141,7 @@ class PrinterCounter(Printer):
         # Envia a requisição HTTP
         headers = {'content-type': 'application/json'}
-        response = requests.put(
+        response = requests.post(
             export_url,
             data=json.dumps(counter_json),
             headers=headers
@@ -148,16 +150,25 @@ class PrinterCounter(Printer):
         try:
             # Check if request has gone wrong
             response.raise_for_status()
-        except HTTPError:
+        except HTTPError, e:
             # Something got wrong, raise error
-            log.error("Erro na insercao do contador para a impressora %s\n", self.network_ip, response.text)
+            log.error("Erro na insercao do contador para a impressora %s\n%s", self.network_ip, response.text)
+            log.error(e.message)
             return False
         if response.status_code == 200:
             log.info("Contador para a impressora %s com contador %s"
                      "exportado com sucesso", self.network_ip, self.counter)
             # Remove o contador
-            session.remove(self)
+            session.execute(
+                PrinterCounter.__table__.delete().where(
+                    and_(
+                        PrinterCounter.__table__.c.network_ip == self.network_ip,
+                        PrinterCounter.__table__.c.counter == self.counter,
+                        PrinterCounter.__table__.c.counter_time == self.counter_time,
+                    )
+                )
+            )
             session.flush()
             return True
         else:
@@ -32,7 +32,7 @@ class SnmpSession(object):
                  DestHost="localhost",
                  Community="public",
                  Verbose=True,
-                 Timeout=10000000
+                 Timeout=1000000
                  ):
         """
         Sessão SNMP. Links úteis:
@@ -75,7 +75,7 @@ class SnmpSession(object):
                                 Version=self.Version,
                                 DestHost=self.DestHost,
                                 Community=self.Community,
-                                Timeout=self.Timeout)
+                                Timeout=int(self.Timeout))
             self.hostrec.query = result
         except Exception, err:
             if self.Verbose:
	@@ -32,7 +32,7 @@ class SnmpSession(object):		@@ -32,7 +32,7 @@ class SnmpSession(object):
32	DestHost="localhost",	32	DestHost="localhost",
33	Community="public",	33	Community="public",
34	Verbose=True,	34	Verbose=True,
35	- Timeout=10000000	35	+ Timeout=1000000
36	):	36	):
37	"""	37	"""
38	Sessão SNMP. Links úteis:	38	Sessão SNMP. Links úteis:
	@@ -75,7 +75,7 @@ class SnmpSession(object):		@@ -75,7 +75,7 @@ class SnmpSession(object):
75	Version=self.Version,	75	Version=self.Version,
76	DestHost=self.DestHost,	76	DestHost=self.DestHost,
77	Community=self.Community,	77	Community=self.Community,
78	- Timeout=self.Timeout)	78	+ Timeout=int(self.Timeout))
79	self.hostrec.query = result	79	self.hostrec.query = result
80	except Exception, err:	80	except Exception, err:
81	if self.Verbose:	81	if self.Verbose: