atoy3731/adguard-sync
1
1
Fork 0
mirror of https://github.com/atoy3731/adguard-sync.git synced 2024-11-10 17:26:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from atoy3731/token-exception-handling

Browse source 
Add logging and exception handling for invalid token responses
This commit is contained in:
Adam Toy 2021-08-11 16:28:46 -04:00 committed by GitHub
commit 85d35e9313
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/app.py
View file

@ -35,6 +35,12 @@ def get_login_cookie(url, user, passwd):
} }
response = requests.post('{}/control/login'.format(url), data=json.dumps(creds)) response = requests.post('{}/control/login'.format(url), data=json.dumps(creds))
if response.status_code != 200:
print('ERROR: Unable to acquire cookie.')
print('Message: {}'.format(response.text))
return None
return response.cookies['agh_session'] return response.cookies['agh_session']
@ -128,6 +134,9 @@ if __name__ == '__main__':
primary_cookie = get_login_cookie(ADGUARD_PRIMARY, ADGUARD_USER, ADGUARD_PASS) primary_cookie = get_login_cookie(ADGUARD_PRIMARY, ADGUARD_USER, ADGUARD_PASS)
secondary_cookie = get_login_cookie(ADGUARD_SECONDARY, SECONDARY_ADGUARD_USER, SECONDARY_ADGUARD_PASS) secondary_cookie = get_login_cookie(ADGUARD_SECONDARY, SECONDARY_ADGUARD_USER, SECONDARY_ADGUARD_PASS)
if primary_cookie is None or secondary_cookie is None:
exit(1)
while True: while True:
try: try:
primary_entries = get_entries(ADGUARD_PRIMARY, primary_cookie) primary_entries = get_entries(ADGUARD_PRIMARY, primary_cookie)
@ -165,4 +174,7 @@ if __name__ == '__main__':
primary_cookie = get_login_cookie(ADGUARD_PRIMARY, ADGUARD_USER, ADGUARD_PASS) primary_cookie = get_login_cookie(ADGUARD_PRIMARY, ADGUARD_USER, ADGUARD_PASS)
secondary_cookie = get_login_cookie(ADGUARD_SECONDARY, SECONDARY_ADGUARD_USER, SECONDARY_ADGUARD_PASS) secondary_cookie = get_login_cookie(ADGUARD_SECONDARY, SECONDARY_ADGUARD_USER, SECONDARY_ADGUARD_PASS)
if primary_cookie is None or secondary_cookie is None:
exit(1)
time.sleep(REFRESH_INTERVAL_SECS) time.sleep(REFRESH_INTERVAL_SECS)