Skip to content

Commit

Permalink
Fix cmd/jocko/main.go
Browse files Browse the repository at this point in the history
* Rename the variable name of `server` to `srv` because it shadows the package declaration of `github.com/travisjeffery/jocko/server`
* Defer the call of `srv.Close()` so that it is called surely even if the panic occur
* Capitalize the `raft` and `serf` in string values
  • Loading branch information
keijiyoshida authored and Travis Jeffery committed Jan 27, 2017
1 parent 0bd2f7f commit cdcf1cb
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions cmd/jocko/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
var (
logDir = kingpin.Flag("logdir", "A comma separated list of directories under which to store log files").Default("/tmp/jocko").String()
tcpAddr = kingpin.Flag("tcpaddr", "HTTP Address to listen on").String()
raftDir = kingpin.Flag("raftdir", "Directory for raft to store data").String()
raftDir = kingpin.Flag("raftdir", "Directory for Raft to store data").String()
raftAddr = kingpin.Flag("raftaddr", "Address for Raft to bind on").String()
raftPort = kingpin.Flag("raftport", "Port for Raft to bind on").Int()
serfPort = kingpin.Flag("serfport", "Port for Serf to bind on").Default("7946").Int()
serfMembers = kingpin.Flag("serfmembers", "List of existing serf members").Strings()
serfMembers = kingpin.Flag("serfmembers", "List of existing Serf members").Strings()
brokerID = kingpin.Flag("id", "Broker ID").Int32()
debugLogs = kingpin.Flag("debug", "Enable debug logs").Default("false").Bool()
)
Expand Down Expand Up @@ -53,17 +53,18 @@ func main() {
fmt.Fprintf(os.Stderr, "Error with new broker: %s\n", err)
os.Exit(1)
}
server := server.New(*tcpAddr, store, logger)
if err := server.Start(); err != nil {
srv := server.New(*tcpAddr, store, logger)
if err := srv.Start(); err != nil {
fmt.Fprintf(os.Stderr, "Error starting server: %s\n", err)
os.Exit(1)
}

defer srv.Close()

gracefully.Timeout = 10 * time.Second
gracefully.Shutdown()

if err := store.Shutdown(); err != nil {
panic(err)
}
server.Close()
}

0 comments on commit cdcf1cb

Please sign in to comment.