r4sas/yggdrasil-api
1
0
Fork 0
mirror of https://github.com/r4sas/Niflheim-api synced 2025-09-05 18:52:06 +00:00
Code Issues Releases Wiki Activity

Update vserv.py

Browse Source
This commit is contained in:
yakamok 2018-07-08 16:01:07 +02:00 committed by GitHub
parent 9a2354205f
commit f8fbea016f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vserv.py
View File

@ -41,8 +41,8 @@ def isdatabase(db_path):
try: try:
conn = sqlite3.connect(db_path + 'yggindex.db') conn = sqlite3.connect(db_path + 'yggindex.db')
c = conn.cursor() c = conn.cursor()
c.execute('create table yggindex(ipv6 varchar(45) UNIQUE, coords varchar(50),\ c.execute('''create table yggindex(ipv6 varchar(45) UNIQUE, coords varchar(50),
utimestamp int(40))') ut unixtime default (strftime('%s','now')))''')
conn.commit() conn.commit()
except Error as e: except Error as e:
print(e) print(e)
@ -56,8 +56,8 @@ def insert_new_entry(db_path, ipv6, coords):
try: try:
conn = sqlite3.connect(db_path + "yggindex.db") conn = sqlite3.connect(db_path + "yggindex.db")
c = conn.cursor() c = conn.cursor()
c.execute('''INSERT OR REPLACE INTO yggindex(ipv6, coords, utimestamp) VALUES(?, ?, ?)''',\ conn.execute('''INSERT OR REPLACE INTO yggindex(ipv6, coords) VALUES(?, ?)''',\
(ipv6, coords, utimestamp)) (ipv6, coords))
conn.commit() conn.commit()
conn.close() conn.close()
except Error as e: except Error as e:
@ -69,12 +69,12 @@ def error_check_insert_into_db(dht, switchpeers):
if dht.get("status") == "success": if dht.get("status") == "success":
for x, y in dht["response"]["dht"].iteritems(): for x, y in dht["response"]["dht"].iteritems():
if valid_ipv6_check(x) and check_coords(y["coords"]): if valid_ipv6_check(x) and check_coords(y["coords"]):
insert_new_entry(DB_PATH, x, y["coords"], int(time.time())) insert_new_entry(DB_PATH, x, y["coords"])
if dht.get("status") == "success": if dht.get("status") == "success":
for x in switchpeers["response"]["switchpeers"].iteritems(): for x in switchpeers["response"]["switchpeers"].iteritems():
if valid_ipv6_check(x[1]["ip"]) and check_coords(x[1]["coords"]): if valid_ipv6_check(x[1]["ip"]) and check_coords(x[1]["coords"]):
insert_new_entry(DB_PATH, x[1]["ip"], x[1]["coords"], int(time.time())) insert_new_entry(DB_PATH, x[1]["ip"], x[1]["coords"])
except: except:
print"error in json file, aborting" print"error in json file, aborting"
@ -99,5 +99,5 @@ while True:
try: try:
dataraw, addr = conn.accept() dataraw, addr = conn.accept()
thread.start_new_thread(proccess_incoming_data, (dataraw, addr)) thread.start_new_thread(proccess_incoming_data, (dataraw, addr))
except: except Exception:
print "bloop" print "bloop"