Reconnect to the db if ping failed + removed panic

inverse-inc · Apr 1, 2019 · bb8b3ed · bb8b3ed
1 parent 4c07779
commit bb8b3ed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/go/dhcp/api.go b/go/dhcp/api.go
@@ -14,6 +14,7 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/gorilla/mux"
 	"github.com/inverse-inc/packetfence/go/api-frontend/unifiedapierrors"
+	"github.com/inverse-inc/packetfence/go/log"
 	"github.com/inverse-inc/packetfence/go/pfconfigdriver"
 	"github.com/inverse-inc/packetfence/go/sharedutils"
 	dhcp "github.com/krolaw/dhcp4"
@@ -189,7 +190,7 @@ func handleReleaseIP(res http.ResponseWriter, req *http.Request) {
 	res.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	res.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(res).Encode(result); err != nil {
-		panic(err)
+		log.LoggerWContext(ctx).Error("Error releasing IP: " + err.Error())
 	}
 }
 
@@ -213,7 +214,7 @@ func handleOverrideOptions(res http.ResponseWriter, req *http.Request) {
 	res.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	res.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(res).Encode(result); err != nil {
-		panic(err)
+		log.LoggerWContext(ctx).Error("Error adding MAC options: " + err.Error())
 	}
 }
 
@@ -237,7 +238,7 @@ func handleOverrideNetworkOptions(res http.ResponseWriter, req *http.Request) {
 	res.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	res.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(res).Encode(result); err != nil {
-		panic(err)
+		log.LoggerWContext(ctx).Error("Error adding network options: " + err.Error())
 	}
 }
 
@@ -254,7 +255,7 @@ func handleRemoveOptions(res http.ResponseWriter, req *http.Request) {
 	res.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	res.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(res).Encode(result); err != nil {
-		panic(err)
+		log.LoggerWContext(ctx).Error("Error removing MAC options: " + err.Error())
 	}
 }
 
@@ -271,7 +272,7 @@ func handleRemoveNetworkOptions(res http.ResponseWriter, req *http.Request) {
 	res.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	res.WriteHeader(http.StatusOK)
 	if err := json.NewEncoder(res).Encode(result); err != nil {
-		panic(err)
+		log.LoggerWContext(ctx).Error("Error removing betwork options: " + err.Error())
 	}
 }
 

diff --git a/go/dhcp/keysoption.go b/go/dhcp/keysoption.go
@@ -5,6 +5,9 @@ import (
 )
 
 func MysqlInsert(key string, value string) bool {
+	if err := MySQLdatabase.PingContext(ctx); err != nil {
+		log.LoggerWContext(ctx).Error("Unable to ping database, reconnect: " + err.Error())
+	}
 	rows, err := MySQLdatabase.Query("replace into key_value_storage values(?,?)", "/dhcpd/"+key, value)
 	defer rows.Close()
 	if err != nil {
@@ -16,6 +19,9 @@ func MysqlInsert(key string, value string) bool {
 }
 
 func MysqlGet(key string) (string, string) {
+	if err := MySQLdatabase.PingContext(ctx); err != nil {
+		log.LoggerWContext(ctx).Error("Unable to ping database, reconnect: " + err.Error())
+	}
 	rows, err := MySQLdatabase.Query("select id, value from key_value_storage where id = ?", "/dhcpd/"+key)
 	defer rows.Close()
 	if err != nil {
@@ -36,6 +42,9 @@ func MysqlGet(key string) (string, string) {
 }
 
 func MysqlDel(key string) bool {
+	if err := MySQLdatabase.PingContext(ctx); err != nil {
+		log.LoggerWContext(ctx).Error("Unable to ping database, reconnect: " + err.Error())
+	}
 	rows, err := MySQLdatabase.Query("delete from key_value_storage where id = ?", "/dhcpd/"+key)
 	defer rows.Close()
 	if err != nil {