mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-15 07:20:17 +02:00
API call time-out handling
This commit is contained in:
parent
2dd531c2b7
commit
d2865c97e1
@ -17,7 +17,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_members():
|
def get_fleetup_members():
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/GroupCharacters/" + str(groupid) + ""
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/GroupCharacters/" + str(groupid) + ""
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
fmembers=json.loads(jsondata.decode())
|
fmembers=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {row["UserId"]:{"user_id":row["UserId"],
|
return {row["UserId"]:{"user_id":row["UserId"],
|
||||||
@ -48,7 +51,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_timers():
|
def get_fleetup_timers():
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Timers/" + str(groupid) + ""
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Timers/" + str(groupid) + ""
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
ftimers=json.loads(jsondata.decode())
|
ftimers=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {row["ExpiresString"]:{"solarsystem":row["SolarSystem"],
|
return {row["ExpiresString"]:{"solarsystem":row["SolarSystem"],
|
||||||
@ -63,7 +69,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_doctrines():
|
def get_fleetup_doctrines():
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Doctrines/" + str(groupid) + ""
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Doctrines/" + str(groupid) + ""
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
fdoctrines=json.loads(jsondata.decode())
|
fdoctrines=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {"fleetup_doctrines":fdoctrines["Data"]}
|
return {"fleetup_doctrines":fdoctrines["Data"]}
|
||||||
@ -71,7 +80,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_doctrine(doctrinenumber):
|
def get_fleetup_doctrine(doctrinenumber):
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/DoctrineFittings/%s" % doctrinenumber
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/DoctrineFittings/%s" % doctrinenumber
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
fdoctrine=json.loads(jsondata.decode())
|
fdoctrine=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {"fitting_doctrine":fdoctrine}
|
return {"fitting_doctrine":fdoctrine}
|
||||||
@ -79,7 +91,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_fittings():
|
def get_fleetup_fittings():
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fittings/" + str(groupid) + ""
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fittings/" + str(groupid) + ""
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
ffittings=json.loads(jsondata.decode())
|
ffittings=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {row["FittingId"]:{"fitting_id":row["FittingId"],
|
return {row["FittingId"]:{"fitting_id":row["FittingId"],
|
||||||
@ -95,7 +110,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_fitting(fittingnumber):
|
def get_fleetup_fitting(fittingnumber):
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s" % fittingnumber
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s" % fittingnumber
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
ffitting=json.loads(jsondata.decode())
|
ffitting=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {"fitting_data":ffitting["Data"]}
|
return {"fitting_data":ffitting["Data"]}
|
||||||
@ -103,7 +121,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_doctrineid(fittingnumber):
|
def get_fleetup_doctrineid(fittingnumber):
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s" % fittingnumber
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s" % fittingnumber
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
fdoctrineid=json.loads(jsondata.decode())
|
fdoctrineid=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return fdoctrineid['Data']['Doctrines'][0]['DoctrineId']
|
return fdoctrineid['Data']['Doctrines'][0]['DoctrineId']
|
||||||
@ -111,7 +132,10 @@ class FleetUpManager():
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_fleetup_fitting_eft(fittingnumber):
|
def get_fleetup_fitting_eft(fittingnumber):
|
||||||
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s/eft" % fittingnumber
|
url = "http://api.fleet-up.com/Api.svc/" + str(appkey) + "/" + str(userid) + "/" + str(apiid) + "/Fitting/%s/eft" % fittingnumber
|
||||||
jsondata = requests.get(url).content
|
try:
|
||||||
|
jsondata = requests.get(url).content
|
||||||
|
except requests.exceptions.ConnectionError:
|
||||||
|
r.status_code = "Connection timeout"
|
||||||
ffittingeft=json.loads(jsondata.decode())
|
ffittingeft=json.loads(jsondata.decode())
|
||||||
|
|
||||||
return {"fitting_eft":ffittingeft["Data"]["FittingData"]}
|
return {"fitting_eft":ffittingeft["Data"]["FittingData"]}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user