Browse Source

Cleanup

develop
yakamok 6 years ago committed by GitHub
parent
commit
5cbf32f2e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 42
      api/niflheim-api.py

42
api/niflheim-api.py

@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
from flask import Flask, request, render_template
from flask_restful import Resource, Api
from json import dumps
from flask import jsonify
import time
import sys
import os
import time
from flask import Flask, render_template
from flask_restful import Resource, Api
import requests
import psycopg2
@ -17,14 +12,16 @@ DB_USER = "yggindex" @@ -17,14 +12,16 @@ DB_USER = "yggindex"
DB_NAME = "yggindex"
DB_HOST = "localhost"
#will add this as something seperate and pull down to a file rather
#than request it everytime.
def get_nodelist():
data = requests.get("use the raw view of the github nodelist", timeout=1)
nodes = [x.split() for x in data.text.split('\n') if x]
index_table = {}
for x in nodes:
index_table[x[0]] = x[1]
for key in nodes:
index_table[key[0]] = key[1]
return index_table
@ -45,9 +42,12 @@ def age_calc(ustamp): @@ -45,9 +42,12 @@ def age_calc(ustamp):
return False
#active nodes in the past 4hrs
class nodes_current(Resource):
class nodesCurrent(Resource):
def get(self):
dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
dbconn = psycopg2.connect(host=DB_HOST,\
database=DB_NAME,\
user=DB_USER,\
password=DB_PASSWORD)
cur = dbconn.cursor()
nodes = {}
cur.execute("select * from yggindex")
@ -67,7 +67,10 @@ class nodes_current(Resource): @@ -67,7 +67,10 @@ class nodes_current(Resource):
@app.route("/")
def fpage():
dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
dbconn = psycopg2.connect(host=DB_HOST,\
database=DB_NAME,\
user=DB_USER,\
password=DB_PASSWORD)
cur = dbconn.cursor()
nodes = {}
cur.execute("select * from yggindex")
@ -86,13 +89,16 @@ def fpage(): @@ -86,13 +89,16 @@ def fpage():
@app.route("/contrib")
def cpage():
try:
NODELIST = get_nodelist()
domain_nodelist = get_nodelist()
print "list exists"
except:
print "failed"
NODELIST = None
domain_nodelist = None
dbconn = psycopg2.connect(host=DB_HOST,database=DB_NAME, user=DB_USER, password=DB_PASSWORD)
dbconn = psycopg2.connect(host=DB_HOST,\
database=DB_NAME,\
user=DB_USER,\
password=DB_PASSWORD)
cur = dbconn.cursor()
cur.execute("select * from contrib")
nodes = []
@ -106,8 +112,8 @@ def cpage(): @@ -106,8 +112,8 @@ def cpage():
dbconn.close()
dnodes = []
for x in nodes:
dnodes.append(check_nodelist(NODELIST, x))
for key in nodes:
dnodes.append(check_nodelist(domain_nodelist, key))
dnodes.sort(reverse=True)
@ -115,7 +121,7 @@ def cpage(): @@ -115,7 +121,7 @@ def cpage():
#sort out the api request here for the url
api.add_resource(nodes_current, '/current')
api.add_resource(nodesCurrent, '/current')
if __name__ == '__main__':
app.run(host='::', port=3000)

Loading…
Cancel
Save