ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 17:42:20 +03:00
Code Issues Projects Releases Wiki Activity

More succint error reporting on network connection/timeout.

Browse Source
This commit is contained in:
Jonathan Harris 2015-06-29 17:53:25 +01:00
parent b0b1dd5a9f
commit 437997e963
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
EDMarketConnector.py
View File

@ -5,6 +5,7 @@ import sys
from sys import platform
from os import mkdir
from os.path import expanduser, isdir, join
import requests
from time import time, localtime, strftime
import Tkinter as tk
@ -224,9 +225,18 @@ class AppWindow:
except companion.VerificationRequired:
return prefs.AuthenticationDialog(self.w, self.verify)
# Companion API problem
except companion.ServerError as e:
self.status['text'] = str(e)
except requests.exceptions.ConnectionError as e:
if __debug__: print_exc()
self.status['text'] = "Error: Can't connect to EDDN"
except requests.exceptions.Timeout as e:
if __debug__: print_exc()
self.status['text'] = "Error: Connection to EDDN timed out"
except Exception as e:
if __debug__: print_exc()
self.status['text'] = str(e)

13
companion.py
View File

@ -113,7 +113,12 @@ class Session:
raise CredentialsError()
else:
self.credentials = { 'email' : username, 'password' : password }
r = self.session.post('https://companion.orerve.net/user/login', data = self.credentials, timeout=timeout)
try:
r = self.session.post('https://companion.orerve.net/user/login', data = self.credentials, timeout=timeout)
except:
if __debug__: print_exc()
raise ServerError()
if r.status_code != requests.codes.ok:
self.dump(r)
r.raise_for_status()
@ -147,7 +152,11 @@ class Session:
self.login()
elif self.state == Session.STATE_AUTH:
raise VerificationRequired()
r = self.session.get('https://companion.orerve.net/profile', timeout=timeout)
try:
r = self.session.get('https://companion.orerve.net/profile', timeout=timeout)
except:
if __debug__: print_exc()
raise ServerError()
if r.status_code != requests.codes.ok:
self.dump(r)