Skip to content

Commit

Permalink
fix: logsConfig -> logs_config
Browse files Browse the repository at this point in the history
  • Loading branch information
yubo committed Aug 5, 2021
1 parent 02a0aa4 commit 4a1425b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: pkg clean release release dev devrun

VERSION=5.0.0
RELEASE=rc7
RELEASE=rc8
GENERATOR=RPM
APP_NAME?=n9e-agentd
CGO_ENABLED?=1
Expand Down
6 changes: 5 additions & 1 deletion cmd/mocker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,19 @@ func main() {

var port int
var confd string
var collectRule bool
flag.IntVar(&port, "port", 8000, "listen port")
flag.BoolVar(&collectRule, "collect-rule", false, "enable collect rule provider")
flag.StringVar(&confd, "confd", "./etc/mocker.d", "config dir")
flag.Parse()

for _, r := range routes {
http.HandleFunc(r.pattern, payloadHandle(r.payload))
}

installCollectRules(confd)
if collectRule {
installCollectRules(confd)
}

klog.Infof("listen :%d", port)
klog.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", port), nil))
Expand Down
6 changes: 3 additions & 3 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ var (
func AddFlags() {
proc.RegisterFlags("agent", "agent generic", &Config{})
proc.RegisterFlags("agent.forwarder", "forwarder", &Forwarder{})
proc.RegisterFlags("agent.logsConfig", "logs", &LogsConfig{})
proc.RegisterFlags("agent.clusterChecks", "cluster checks", &ClusterChecks{})
proc.RegisterFlags("agent.logs_config", "logs", &LogsConfig{})
proc.RegisterFlags("agent.cluster_checks", "cluster checks", &ClusterChecks{})
proc.RegisterFlags("agent.statsd", "statsd", &Statsd{})
proc.RegisterFlags("agent.jmx", "jmx", &Jmx{})
proc.RegisterFlags("agent.adminssionController", "adminssion controller", &AdminssionController{})
proc.RegisterFlags("agent.adminssion_controller", "adminssion controller", &AdminssionController{})

fs := proc.NamedFlagSets().FlagSet("global")
fs.StringVarP(&Configfile, "config", "c", "", "Config file path of n9e agentd server.(Deprecated, use -f instead of it)")
Expand Down

0 comments on commit 4a1425b

Please sign in to comment.