Revert "增加logpath参数，自定义logpath的路径：包括统计日志、synclog日志路径，db路径依然在/data/goredis_xxx/db"

This reverts commit 1115228.

Author: blackbeans

.gitignore

@@ -1,5 +1,3 @@
-
-
 .DS_Store
 
 main/goredis-server

goredis_server/go_redis_server_init.go

@@ -27,17 +27,17 @@ func (server *GoRedisServer) Init() (err error) {
 	}
 	server.config = NewConfig(server.levelRedis, PREFIX+"config:")
 	// monitor
-	server.initCommandMonitor(server.opt.LogDir() + "/cmd.log")
+	server.initCommandMonitor(server.directory + "/cmd.log")
 	server.initCommandCounterLog("string", []string{"GET", "SET", "MGET", "MSET", "INCR", "DECR", "INCRBY", "DECRBY"})
 	server.initCommandCounterLog("hash", []string{"HGETALL", "HGET", "HSET", "HDEL", "HMGET", "HMSET", "HINCRBY", "HLEN"})
 	server.initCommandCounterLog("set", []string{"SADD", "SCARD", "SISMEMBER", "SMEMBERS", "SREM"})
 	server.initCommandCounterLog("list", []string{"LPUSH", "RPUSH", "LPOP", "RPOP", "LINDEX", "LLEN", "LRANGE", "LTRIM"})
 	server.initCommandCounterLog("zset", []string{"ZADD", "ZCARD", "ZSCORE", "ZINCRBY", "ZRANGE", "ZRANGEBYSCORE", "ZRANK", "ZREM", "ZREMRANGEBYRANK", "ZREMRANGEBYSCORE", "ZREVRANGE", "ZREVRANGEBYSCORE", "ZREVRANK"})
-	server.initSeqLog(server.opt.LogDir() + "/seq.log")
-	server.initLeveldbIOLog(server.opt.LogDir() + "/leveldb.io.log")
-	server.initLeveldbStatsLog(server.opt.LogDir() + "/leveldb.stats.log")
-	server.initExecLog(server.opt.LogDir() + "/exec.time.log")
-	server.initSlowlog(server.opt.LogDir() + "/slow.log")
+	server.initSeqLog(server.directory + "/seq.log")
+	server.initLeveldbIOLog(server.directory + "/leveldb.io.log")
+	server.initLeveldbStatsLog(server.directory + "/leveldb.stats.log")
+	server.initExecLog(server.directory + "/exec.time.log")
+	server.initSlowlog(server.directory + "/slow.log")
 	stdlog.Printf("init uid %s\n", server.UID())
 	server.initSlaveOf()
 	return
@@ -139,7 +139,7 @@ func (server *GoRedisServer) initSyncLog() error {
 	env.SetBackgroundThreads(2)
 	env.SetHighPriorityBackgroundThreads(1)
 	opts.SetEnv(env)
-	db, e1 := levelredis.Open(server.opt.LogDir()+"/synclog", opts)
+	db, e1 := levelredis.Open(server.directory+"/synclog", opts)
 	if e1 != nil {
 		return e1
 	}
@@ -288,7 +288,7 @@ func (server *GoRedisServer) initLeveldbStatsLog(path string) {
 }
 
 func (server *GoRedisServer) initCommandCounterLog(cate string, cmds []string) {
-	path := fmt.Sprintf("%s/cmd.%s.log", server.opt.LogDir(), cate)
+	path := fmt.Sprintf("%s/cmd.%s.log", server.directory, cate)
 	file, err := openfile(path)
 	if err != nil {
 		panic(err)

goredis_server/options.go

@@ -6,7 +6,6 @@ type Options struct {
 	slaveofHost string
 	slaveofPort int
 	directory   string
-	logdir      string
 }
 
 func NewOptions() (o *Options) {
@@ -37,11 +36,3 @@ func (o *Options) SetDirectory(path string) {
 func (o *Options) Directory() string {
 	return o.directory
 }
-
-func (o *Options) LogDir() string {
-	return o.logdir
-}
-
-func (o *Options) SetLogDir(logdir string) {
-	o.logdir = logdir
-}

main/goredis-server.go

@@ -28,8 +28,6 @@ func main() {
 	slaveof := flag.String("slaveof", "", "replication")
 	procs := flag.Int("procs", 8, "GOMAXPROCS")
 	repair := flag.Bool("repair", false, "repaire rocksdb")
-	logpath := flag.String("logpath", "/home/data", "config goredis log path and synclog path")
-
 	flag.Parse()
 
 	if *version {
@@ -41,9 +39,7 @@ func main() {
 
 	opt := goredis_server.NewOptions()
 	opt.SetBind(fmt.Sprintf("%s:%d", *host, *port))
-
-	dbhome := dbHome(*port)
-	opt.SetDirectory(dbhome)
+	opt.SetDirectory(dbHome(*port))
 	if len(*slaveof) > 0 {
 		h, p, e := splitHostPort(*slaveof)
 		if e != nil {
@@ -53,7 +49,7 @@ func main() {
 	}
 
 	// 重定向日志输出位置
-	opt.SetLogDir(redirectLogOutput(*logpath, *port, dbhome))
+	redirectLogOutput(opt.Directory())
 
 	// repair
 	if *repair {
@@ -101,33 +97,20 @@ func dbHome(port int) string {
 }
 
 // 将Stdout, Stderr重定向到指定文件
-func redirectLogOutput(directory string, port int, defdir string) string {
-
-	logpath := directory
-
-	loginfo, err := os.Stat(directory)
-	//如果没有就是用默认的即 dbhome
-	if os.IsNotExist(err) || !loginfo.IsDir() {
-		directory = defdir
-	}
-
-	logpath = fmt.Sprintf("%s/logs/%d/", logpath, port)
-	os.MkdirAll(logpath, os.ModePerm)
-
+func redirectLogOutput(directory string) {
 	oldout := os.Stdout
-
-	os.Stdout, err = os.OpenFile(logpath+"/stdout.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, os.ModePerm)
+	var err error
+	os.Stdout, err = os.OpenFile(directory+"stdout.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, os.ModePerm)
 	if err != nil {
 		panic(err)
 	}
 	// 同时输出到屏幕和文件
 	stdlog.SetOutput(io.MultiWriter(oldout, os.Stdout))
 
-	os.Stderr, err = os.OpenFile(logpath+"stderr.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, os.ModePerm)
+	os.Stderr, err = os.OpenFile(directory+"stderr.log", os.O_WRONLY|os.O_CREATE|os.O_APPEND, os.ModePerm)
 	if err != nil {
 		panic(err)
 	}
-	return logpath
 }
 
 func splitHostPort(addr string) (host string, port int, err error) {