diff --git a/src/main/main.go b/src/main/main.go index a5c26b7..4104d8e 100644 --- a/src/main/main.go +++ b/src/main/main.go @@ -10,6 +10,8 @@ import ( "github.com/alexflint/go-arg" "server" + "server/log" + "server/settings" "server/version" ) @@ -41,11 +43,11 @@ func main() { if params.Add != "" { add() } - + settings.Path = params.Path Preconfig(params.DontKill) - server.Start(params.Path, params.Port, params.RDB) - fmt.Println(server.WaitServer()) + server.Start(params.Port, params.RDB) + log.TLogln(server.WaitServer()) time.Sleep(time.Second * 3) os.Exit(0) } diff --git a/src/server/server.go b/src/server/server.go index cdf5941..3d61f8f 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -5,8 +5,8 @@ import ( "server/web" ) -func Start(settingsPath, port string, roSets bool) { - settings.InitSets(settingsPath, roSets) +func Start(port string, roSets bool) { + settings.InitSets(roSets) if port == "" { port = "8090" } diff --git a/src/server/settings/db.go b/src/server/settings/db.go index 480b141..2d3ed8a 100644 --- a/src/server/settings/db.go +++ b/src/server/settings/db.go @@ -14,8 +14,8 @@ type TDB struct { db *bolt.DB } -func NewTDB(path string, readOnly bool) *TDB { - db, err := bolt.Open(filepath.Join(path, "config.db"), 0666, nil) +func NewTDB(readOnly bool) *TDB { + db, err := bolt.Open(filepath.Join(Path, "config.db"), 0666, nil) if err != nil { log.TLogln(err) return nil @@ -23,7 +23,7 @@ func NewTDB(path string, readOnly bool) *TDB { tdb := new(TDB) tdb.db = db - tdb.Path = path + tdb.Path = Path tdb.ReadOnly = readOnly return tdb } diff --git a/src/server/settings/settings.go b/src/server/settings/settings.go index 950eaf9..b761731 100644 --- a/src/server/settings/settings.go +++ b/src/server/settings/settings.go @@ -5,9 +5,8 @@ var ( Path string ) -func InitSets(path string, readOnly bool) { - Path = path - tdb = NewTDB(path, readOnly) +func InitSets(readOnly bool) { + tdb = NewTDB(readOnly) loadBTSets() } diff --git a/src/server/version/version.go b/src/server/version/version.go index ef40905..e647f5c 100644 --- a/src/server/version/version.go +++ b/src/server/version/version.go @@ -1,4 +1,4 @@ package version -const Version = "1.2.78_" +const Version = "1.2.78_1" const VerInt = 78