remove log, improve stability

Author: cylonchau

README.md

@@ -14,7 +14,7 @@ fiewall gateway is a firewall central controller as firewalld
 - Async batch task (only add).
 - Can control thousands of linux machine via firewall gateway remotely.
 - Support change tempate of thousands of machine fastly.
-- Support wrong operation.
+- Support wrong operation backoff.
 - Support delay command effect.
 - Support IPtables NAT
 - Support template (only enable db).
@@ -39,6 +39,10 @@ make
 
 [HTTP API DOC](https://documenter.getpostman.com/view/12796679/UV5agGNr)
 
+- v1 runtime.
+- v2 permanent.
+- v3 async task.
+
 ## FAQ
 
 ### Why not use ssh or ansible tools.

cmd/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 
 	"github.com/spf13/pflag"
@@ -11,32 +10,6 @@ import (
 	"github.com/cylonchau/firewalldGateway/server"
 )
 
-var (
-	configuration string
-	h             bool
-)
-
-func BuildInitFlags() {
-	flagset := flag.CommandLine
-	flagset.StringVar(&configuration, "f", "./firewalld-gateway.conf", "set configuration file.")
-	flagset.BoolVar(&h, "h", false, "Prints a short help text and exists.")
-	flagset.Usage = usage
-	klog.InitFlags(flagset)
-	flag.Parse()
-}
-
-func cmdPrompt(str string) {
-	fmt.Fprintf(os.Stderr, "firewall-api: invalid option, %s\n", str)
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, `Usage: firewalld-gateway [-f configfile] [-h help]
-
-Options
-`)
-	flag.PrintDefaults()
-}
-
 func main() {
 	command := server.NewProxyCommand()
 	flagset := flag.CommandLine

firewalld-gateway.conf

@@ -1,6 +1,5 @@
 appname = "firewalld-gateway"
-loglevel = "debug"
-port = 7777
+port = 2952
 address = "0.0.0.0"
 dbus_port = 55556
 

log/logger.go

@@ -0,0 +1,12 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+
+	q "github.com/cylonchau/firewalldGateway/apis"
+	code "github.com/cylonchau/firewalldGateway/server/apis"
+)
+
+func ping(c *gin.Context) {
+	q.SuccessResponse(c, code.OK, "pong")
+}

server/app/router/health.go

@@ -9,6 +9,7 @@ import (
 )
 
 func RegisteredRouter(e *gin.Engine) {
+	e.Handle("GET", "ping", ping)
 	firewall_api := e.Group("/fw")
 	v1Group := firewall_api.Group("/v1")
 	v2Group := firewall_api.Group("/v2")

server/app/router/router.go

@@ -37,12 +37,12 @@ func (this *MasqueradeRouter) enableInRuntime(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
+
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
-
+	defer dbusClient.Destroy()
 	if err := dbusClient.EnableMasquerade(query.Zone, query.Timeout); err != nil {
 		q.APIResponse(c, err, nil)
 		return
@@ -67,12 +67,12 @@ func (this *MasqueradeRouter) disableInRuntime(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
+
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
-
+	defer dbusClient.Destroy()
 	if err := dbusClient.DisableMasquerade(query.Zone); err != nil {
 		q.APIResponse(c, err, nil)
 		return
@@ -97,11 +97,11 @@ func (this *MasqueradeRouter) queryInRuntime(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
+	defer dbusClient.Destroy()
 
 	isenable, err := dbusClient.QueryMasquerade(query.Zone)
 
@@ -134,11 +134,12 @@ func (this *MasqueradeRouter) enableInPermanent(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
+
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
+	defer dbusClient.Destroy()
 
 	if err := dbusClient.PermanentEnableMasquerade(query.Zone); err != nil {
 		q.APIResponse(c, err, nil)
@@ -164,11 +165,12 @@ func (this *MasqueradeRouter) disableInPermanent(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
+
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
+	defer dbusClient.Destroy()
 
 	if err := dbusClient.PermanentDisableMasquerade(query.Zone); err != nil {
 		q.APIResponse(c, err, nil)
@@ -194,11 +196,12 @@ func (this *MasqueradeRouter) queryInPermanent(c *gin.Context) {
 	}
 
 	dbusClient, err := firewalld.NewDbusClientService(query.Ip)
-	defer dbusClient.Destroy()
+
 	if err != nil {
 		q.ConnectDbusService(c, err)
 		return
 	}
+	defer dbusClient.Destroy()
 
 	isenable, err := dbusClient.PermanentQueryMasquerade(query.Zone)