"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "apps/nsqadmin/main.go" between
nsq-1.2.0.tar.gz and nsq-1.2.1.tar.gz

About: nsq is a realtime distributed and and decentralized messaging platform.

main.go  (nsq-1.2.0)	:	main.go  (nsq-1.2.1)
skipping to change at line 12		skipping to change at line 12
import (		import (
"flag"		"flag"
"fmt"		"fmt"
"os"		"os"
"path/filepath"		"path/filepath"
"sync"		"sync"
"syscall"		"syscall"
"github.com/BurntSushi/toml"		"github.com/BurntSushi/toml"
"github.com/judwhite/go-svc/svc"		"github.com/judwhite/go-svc"
"github.com/mreiferson/go-options"		"github.com/mreiferson/go-options"
"github.com/nsqio/nsq/internal/app"		"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/lg"		"github.com/nsqio/nsq/internal/lg"
"github.com/nsqio/nsq/internal/version"		"github.com/nsqio/nsq/internal/version"
"github.com/nsqio/nsq/nsqadmin"		"github.com/nsqio/nsq/nsqadmin"
)		)
func nsqadminFlagSet(opts *nsqadmin.Options) *flag.FlagSet {		func nsqadminFlagSet(opts *nsqadmin.Options) *flag.FlagSet {
flagSet := flag.NewFlagSet("nsqadmin", flag.ExitOnError)		flagSet := flag.NewFlagSet("nsqadmin", flag.ExitOnError)
skipping to change at line 96		skipping to change at line 96
opts := nsqadmin.NewOptions()		opts := nsqadmin.NewOptions()
flagSet := nsqadminFlagSet(opts)		flagSet := nsqadminFlagSet(opts)
flagSet.Parse(os.Args[1:])		flagSet.Parse(os.Args[1:])
if flagSet.Lookup("version").Value.(flag.Getter).Get().(bool) {		if flagSet.Lookup("version").Value.(flag.Getter).Get().(bool) {
fmt.Println(version.String("nsqadmin"))		fmt.Println(version.String("nsqadmin"))
os.Exit(0)		os.Exit(0)
}		}
var cfg map[string]interface{}		var cfg config
configFile := flagSet.Lookup("config").Value.String()		configFile := flagSet.Lookup("config").Value.String()
if configFile != "" {		if configFile != "" {
_, err := toml.DecodeFile(configFile, &cfg)		_, err := toml.DecodeFile(configFile, &cfg)
if err != nil {		if err != nil {
logFatal("failed to load config file %s - %s", configFile , err)		logFatal("failed to load config file %s - %s", configFile , err)
}		}
}		}
		cfg.Validate()
options.Resolve(opts, flagSet, cfg)		options.Resolve(opts, flagSet, cfg)
nsqadmin, err := nsqadmin.New(opts)		nsqadmin, err := nsqadmin.New(opts)
if err != nil {		if err != nil {
logFatal("failed to instantiate nsqadmin - %s", err)		logFatal("failed to instantiate nsqadmin - %s", err)
}		}
p.nsqadmin = nsqadmin		p.nsqadmin = nsqadmin
go func() {		go func() {
err := p.nsqadmin.Main()		err := p.nsqadmin.Main()
End of changes. 3 change blocks.
2 lines changed or deleted		3 lines changed or added

---