Merge branch 'master' of github.com:MISP/misp-modules into chrisr3d_patch

pipenv
chrisr3d 2018-11-13 16:05:24 +01:00
commit 651f69126d
1 changed files with 8 additions and 4 deletions

View File

@ -24,10 +24,14 @@ start_time = 0
conversion_rates = {}
def get_consumption(output=False):
req = requests.get(converter_rls)
jreq = req.json()
minute = str(jreq['Minute']['CallsLeft']['Histo'])
hour = str(jreq['Hour']['CallsLeft']['Histo'])
try:
req = requests.get(converter_rls)
jreq = req.json()
minute = str(jreq['Data']['calls_left']['minute'])
hour = str(jreq['Data']['calls_left']['hour'])
except:
minute = str(-1)
hour = str(-1)
# Debug out for the console
print("Calls left this minute / hour: " + minute + " / " + hour)
return minute, hour