Reconnect to the db if ping failed + removed panic

Author: fdurand

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"
@@ -205,7 +206,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())
 	}
 }
 
@@ -229,7 +230,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())
 	}
 }
 
@@ -253,7 +254,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())
 	}
 }
 
@@ -270,7 +271,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())
 	}
 }
 
@@ -287,7 +288,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())
 	}
 }
 

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 {