mirror of https://github.com/shunfei/cronsun
修改冲突
parent
f4985690c1
commit
bf076dd7b0
|
@ -18,7 +18,7 @@ import (
|
|||
|
||||
var (
|
||||
level = flag.Int("l", 0, "log level, -1:debug, 0:info, 1:warn, 2:error")
|
||||
confFile = flag.String("conf", "/conf/files/base.json", "config file path")
|
||||
confFile = flag.String("conf", "conf/files/base.json", "config file path")
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
@ -19,7 +19,7 @@ import (
|
|||
|
||||
var (
|
||||
level = flag.Int("l", 0, "log level, -1:debug, 0:info, 1:warn, 2:error")
|
||||
confFile = flag.String("conf", "/conf/files/base.json", "config file path")
|
||||
confFile = flag.String("conf", "conf/files/base.json", "config file path")
|
||||
network = flag.String("network", "", "network protocol of listen address: ipv4/ipv6, or empty use both")
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue