Browse Source

Debug constant to self package

Vova Tkach 6 years ago
parent
commit
a6810fdbb7
3 changed files with 10 additions and 8 deletions
  1. 3 0
      constants/constants.go
  2. 4 5
      engine/wrapper/wrapper.go
  3. 3 3
      main.go

+ 3 - 0
constants/constants.go

@@ -0,0 +1,3 @@
+package constants
+
+const Debug = !false

+ 4 - 5
engine/wrapper/wrapper.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"strings"
 
+	"golang-fave/constants"
 	"golang-fave/engine/sessions"
 	templates "golang-fave/engine/wrapper/resources/templates"
 )
@@ -45,7 +46,6 @@ type Wrapper struct {
 	LoggerAcc    *log.Logger
 	LoggerErr    *log.Logger
 	Session      *sessions.Session
-	Debug        bool
 }
 
 func (this *Wrapper) tmplGetSystemData() tmplDataSystem {
@@ -64,7 +64,7 @@ func (this *Wrapper) tmplGetSystemData() tmplDataSystem {
 	}
 }
 
-func New(w *http.ResponseWriter, r *http.Request, vhost string, port string, wwwdir string, vhosthome string, debug bool) *Wrapper {
+func New(w *http.ResponseWriter, r *http.Request, vhost string, port string, wwwdir string, vhosthome string) *Wrapper {
 	return &Wrapper{
 		VHost:        vhost,
 		Port:         port,
@@ -72,7 +72,6 @@ func New(w *http.ResponseWriter, r *http.Request, vhost string, port string, www
 		DirVHostHome: vhosthome,
 		W:            w,
 		R:            r,
-		Debug:        debug,
 	}
 }
 
@@ -85,7 +84,7 @@ func (this *Wrapper) Run(hRun handleRun) {
 	this.LoggerErr = log.New(os.Stdout, this.VHost+", ", log.LstdFlags)
 
 	// Attach file for access log
-	if !this.Debug {
+	if !constants.Debug {
 		acclogfile, acclogfileerr := os.OpenFile(this.DirVHostHome+"/logs/access.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 		if acclogfileerr == nil {
 			defer acclogfile.Close()
@@ -94,7 +93,7 @@ func (this *Wrapper) Run(hRun handleRun) {
 	}
 
 	// Attach file for access log
-	if !this.Debug {
+	if !constants.Debug {
 		errlogfile, errlogfileerr := os.OpenFile(this.DirVHostHome+"/logs/error.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 		if errlogfileerr == nil {
 			defer errlogfile.Close()

+ 3 - 3
main.go

@@ -12,12 +12,11 @@ import (
 	"strings"
 	"time"
 
+	//"golang-fave/constants"
 	"golang-fave/engine/actions"
 	"golang-fave/engine/wrapper"
 )
 
-const C_Debug = !false
-
 var ParamHost string
 var ParamPort int
 var ParamWwwDir string
@@ -116,7 +115,8 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Server", "fave.pro")
 
 	// Create and start engine
-	wrapper.New(&w, r, host, port, ParamWwwDir, VhostHomeDir, C_Debug).
+	//wrapper.New(&w, r, host, port, ParamWwwDir, VhostHomeDir, C_Debug).
+	wrapper.New(&w, r, host, port, ParamWwwDir, VhostHomeDir).
 		Run(func(wrapper *wrapper.Wrapper) bool {
 			// Actions
 			action := actions.New(wrapper)