add run.log, improve build script

TeaWeb · May 16, 2019 · 1d1309a · 1d1309a
1 parent 2dfe5c4
commit 1d1309a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/src/main/build.sh b/src/main/build.sh
@@ -25,6 +25,20 @@ export GOARCH=386
 
 build
 
+# linux arm64
+export GOPATH=`pwd`/../../
+export GOOS=linux
+export GOARCH=arm64
+
+build
+
+# linux arm32
+export GOPATH=`pwd`/../../
+export GOOS=linux
+export GOARCH=arm
+
+build
+
 # windows 64
 export GOPATH=`pwd`/../../
 export GOOS=windows

diff --git a/src/main/configs/server.sample.conf b/src/main/configs/server.sample.conf
@@ -1,7 +1,7 @@
 # 'configs/server.conf' sample
 
 # environment code
-env: dev
+env: prod
 
 # http
 http:

diff --git a/src/main/logs/.gitignore b/src/main/logs/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/src/main/logs/README.md b/src/main/logs/README.md
@@ -0,0 +1 @@
+`run.log` - runtime log
diff --git a/src/main/utils.sh b/src/main/utils.sh
@@ -34,6 +34,7 @@ function build() {
     mkdir ${TARGET}/web/tmp
     mkdir ${TARGET}/configs
     mkdir ${TARGET}/data
+    mkdir ${TARGET}/logs
 
     echo "[build static file]"
 

diff --git a/src/source/github.com/TeaWeb/cluster-code/shell/shell.go b/src/source/github.com/TeaWeb/cluster-code/shell/shell.go
@@ -5,7 +5,9 @@ import (
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/files"
 	"github.com/iwind/TeaGo/lists"
+	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/types"
+	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -34,6 +36,16 @@ func (this *Shell) Start() {
 	// write current pid
 	files.NewFile(Tea.Root + Tea.DS + "bin" + Tea.DS + "pid").
 		WriteString(fmt.Sprintf("%d", os.Getpid()))
+
+	// log
+	if !Tea.IsTesting() {
+		fp, err := os.OpenFile(Tea.Root+"/logs/run.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
+		if err == nil {
+			log.SetOutput(fp)
+		} else {
+			logs.Println("[error]" + err.Error())
+		}
+	}
 }
 
 // reset root
@@ -84,7 +96,7 @@ func (this *Shell) execArgs() bool {
 	}
 
 	if len(args) > 0 {
-		fmt.Println("Unknown command option '" + strings.Join(args, " ") + "', run './bin/teaweb -h' to lookup the usage.")
+		fmt.Println("Unknown command option '" + strings.Join(args, " ") + "', run './bin/teaweb-cluster -h' to lookup the usage.")
 		return true
 	}
 	return false