aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWojciech Kosior <kwojtus@protonmail.com>2020-06-16 21:34:57 +0200
committerWojciech Kosior <kwojtus@protonmail.com>2020-06-16 21:34:57 +0200
commit809e3b7a6e189987b5ede5689bfb74979b6f6104 (patch)
tree5ae5f070d233e905e896efc93376f347916f9063 /src
parent5a885716a2212c2147bf8c5a8c91be8bf7050b15 (diff)
download0tdns-809e3b7a6e189987b5ede5689bfb74979b6f6104.tar.gz
0tdns-809e3b7a6e189987b5ede5689bfb74979b6f6104.zip
write failures to database separately for each vpn and distinguishing between vpn server failure and python perform_queries.py's crash
Diffstat (limited to 'src')
-rwxr-xr-xsrc/hourly.py48
1 files changed, 27 insertions, 21 deletions
diff --git a/src/hourly.py b/src/hourly.py
index 5af9e4d..bb95fe7 100755
--- a/src/hourly.py
+++ b/src/hourly.py
@@ -6,6 +6,8 @@ from os import path, waitpid, unlink
from time import gmtime, strftime, sleep
import re
+import psycopg2
+
# our own module used by several scripts in the project
from ztdnslib import start_db_connection, \
get_default_host_address, get_ztdns_config
@@ -190,14 +192,31 @@ def do_hourly_work(hour, logfile):
if subnet:
break
- if exit_status == 2:
- # this means our perform_queries.py crashed... not good
- logfile.write('performing queries through vpn {} failed\n'\
- .format(vpn_id))
- elif exit_status != 0:
- # vpn server is probably not responding
- logfile.write('connection to vpn {} failed\n'\
- .format(vpn_id))
+ if exit_status != 0:
+ if exit_status == 2:
+ # this means our perform_queries.py crashed... not good
+ logfile.write('performing queries through vpn {} failed\n'\
+ .format(vpn_id))
+ result_info = 'internal failure: process_crash'
+ else:
+ # vpn server is probably not responding
+ logfile.write('connection to vpn {} failed\n'\
+ .format(vpn_id))
+ result_info = 'internal failure: vpn_connection_failure'
+
+ try:
+ cursor.execute('''
+ INSERT INTO user_side_responses
+ (date, result, dns_id, service_id, vpn_id)
+ (SELECT TIMESTAMP WITH TIME ZONE %s, %s,
+ dns_id, service_id, vpn_id
+ FROM user_side_queries
+ WHERE vpn_id = %s);
+ ''', (hour, result_info, vpn_id))
+ except psycopg2.IntegrityError:
+ logfile.write('results already exist for vpn {}\n'\
+ .format(vpn_id))
+
pids_wrappers.pop(pid)
subnets.add(subnet)
@@ -227,19 +246,6 @@ def do_hourly_work(hour, logfile):
while len(pids_wrappers) > 0:
wait_for_wrapper_process()
- cursor.execute('''
- INSERT INTO user_side_responses(date, result, dns_id, service_id, vpn_id)
- (SELECT TIMESTAMP WITH TIME ZONE %s,
- 'internal failure: vpn_connection_failure',
- q.dns_id, q.service_id, q.vpn_id
- FROM user_side_responses AS r RIGHT JOIN user_side_queries AS q
- ON q.service_id = r.service_id AND
- q.dns_id = r.dns_id AND
- q.vpn_id = r.vpn_id AND
- date = %s
- WHERE r.id IS NULL AND q.vpn_id = ANY(%s));
- ''', (hour, hour, handled_vpns))
-
cursor.close()
connection.close()