More tests

test_urlchecker_http.py

@@ -8,7 +8,7 @@ import mock
 import peewee
 
 
-class UrlCheckerStatusTestCase(unittest.TestCase):
+class UrlCheckerHttpTestCase(unittest.TestCase):
     def setUp(self):
         self.db = LogDB(":memory:")
         self.db.createTables()
@@ -306,7 +306,7 @@ class UrlCheckerStatusTestCase(unittest.TestCase):
 
 def suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(UrlCheckerStatusTestCase))
+    suite.addTest(unittest.makeSuite(UrlCheckerHttpTestCase))
     return suite
 
 

urlchecker_db.py

@@ -43,12 +43,12 @@ class LogDB:
         # Store remote network status
         class NetworkChange(BaseModel):
             status = peewee.ForeignKeyField(Status)
-            ip = peewee.TextField(index=True)
+            ip = peewee.TextField()
             transport = peewee.TextField()
             port = peewee.IntegerField()
             state = peewee.TextField()
-            # class Meta:
-            #     primary_key = peewee.CompositeKey("status", "ip", "transport", "port")
+            class Meta:
+                primary_key = peewee.CompositeKey("status", "ip", "transport", "port")
 
         class DnsChange(BaseModel):
             status = peewee.ForeignKeyField(Status)
@@ -59,8 +59,8 @@ class LogDB:
 
         class HttpCodeChange(BaseModel):
             status = peewee.ForeignKeyField(Status)
-            ip = peewee.TextField(index=True)
-            url = peewee.TextField(index=True)
+            ip = peewee.TextField()
+            url = peewee.TextField()
             status_code = peewee.IntegerField()
             class Meta:
                 primary_key = peewee.CompositeKey("status", "ip", "url")

urlchecker_network.py

@@ -30,7 +30,7 @@ def logNetwork(db, ip, transport, port, state, status_id):
                 port=port,
                 state=state,
             )
-        return previous_entry.id
+        return previous_entry.status
 
 
 def isTcpPortOpen(db, ip, port, status_id):
@@ -53,6 +53,10 @@ def isTcpPortOpen(db, ip, port, status_id):
             # OSError: [Errno 101] Network is unreachable
             state = "unreachable"
         else:
+            sock.close()
+            raise
+    except:
+      sock.close()
       raise
 
     sock.close()