Commit 04d741a7 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Add another error (1046) to the DB retry list of errors.

Also add constant for ROLE=gw.
parent 618cf2ad
......@@ -169,6 +169,7 @@ use Exporter;
TBDB_IFACEROLE_CONTROL TBDB_IFACEROLE_EXPERIMENT
TBDB_IFACEROLE_JAIL TBDB_IFACEROLE_FAKE TBDB_IFACEROLE_OTHER
TBDB_IFACEROLE_GW
TBDB_ROUTERTYPE_NONE TBDB_ROUTERTYPE_OSPF
TBDB_ROUTERTYPE_STATIC TBDB_ROUTERTYPE_MANUAL
......@@ -535,6 +536,7 @@ sub TBDB_IFACEROLE_CONTROL() { "ctrl"; }
sub TBDB_IFACEROLE_EXPERIMENT() { "expt"; }
sub TBDB_IFACEROLE_JAIL() { "jail"; }
sub TBDB_IFACEROLE_FAKE() { "fake"; }
sub TBDB_IFACEROLE_GW() { "gw"; }
sub TBDB_IFACEROLE_OTHER() { "other"; }
# Routertypes.
......@@ -3197,7 +3199,8 @@ sub DBQuery($)
" Error: " . $DB->errstr . " ($err)";
}
if (defined($result) ||
($DB->err != 2006) && ($DB->err != 1053) && ($DB->err != 2013)) {
($DB->err != 2006) && ($DB->err != 1053) && ($DB->err != 2013) &&
($DB->err != 1046)) {
last;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment