Skip to content

Commit 7435ac3

Browse files
committed
Fixing replication-manager-cli not starting caused by OS User code in flags
1 parent decb245 commit 7435ac3

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

clients/client_cmd.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import (
1919
"net/http"
2020
"net/url"
2121
"os"
22-
"syscall"
23-
2422
"strings"
23+
"syscall"
2524
"time"
2625

2726
termbox "github.com/nsf/termbox-go"
@@ -261,7 +260,9 @@ func initStatusFlags(cmd *cobra.Command) {
261260
}
262261

263262
func initConfiguratorFlags(cmd *cobra.Command) {
264-
initServerApiFlags(configuratorCmd)
263+
// initServerApiFlags(configuratorCmd)
264+
RepMan = new(server.ReplicationManager)
265+
RepMan.InitUser()
265266
RepMan.AddFlags(configuratorCmd.Flags(), &conf)
266267
v := viper.GetViper()
267268
v.SetConfigType("toml")

clients/client_configurator.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,15 @@ var configuratorCmd = &cobra.Command{
6161
Short: "Config generator",
6262
Long: `Config generator produce tar.gz for databases and proxies based on ressource and tags description`,
6363
Run: func(cmd *cobra.Command, args []string) {
64-
conf.WithEmbed = WithEmbed
65-
RepMan = new(server.ReplicationManager)
64+
conf.WithEmbed = "ON"
65+
6666
RepMan.SetDefaultFlags(viper.GetViper())
6767
conf.HttpServ = false
6868
conf.ApiServ = false
69+
conf.GraphiteEmbedded = false
6970
RepMan.InitConfig(conf, false)
7071
go RepMan.Run()
71-
time.Sleep(2 * time.Second)
72+
time.Sleep(3 * time.Second)
7273
cluster := RepMan.Clusters[RepMan.ClusterList[0]]
7374

7475
if cluster == nil {

server/server.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func (repman *ReplicationManager) AddFlags(flags *pflag.FlagSet, conf *config.Co
271271
flag.StringVar(&configPath, "config", "", "help message")
272272
flag.Parse()
273273

274-
if usr == "" {
274+
if usr == "" && repman != nil {
275275
usr = repman.OsUser.Name
276276
}
277277
flags.StringVar(&conf.MonitoringSystemUser, "user", "", "OS User for running repman")
@@ -1081,6 +1081,8 @@ func (repman *ReplicationManager) initFS(conf config.Config) error {
10811081
//test si y'a un repertoire ./.replication-manager/config.toml sinon on le créer depuis embed
10821082
//test y'a un repertoire ./.replication-manager/data sinon on le créer
10831083
//test y'a un repertoire ./.replication-manager/share sinon on le créer
1084+
//repman.LogModulePrintf(repman.Conf.Verbose, config.ConstLogModGeneral, config.LvlInfo, "Embeded run config dir : %s", conf.ConfDir)
1085+
10841086
if conf.ConfDirBackup == "" {
10851087
repman.Logrus.Fatalf("Monitoring config backup directory not defined")
10861088
}
@@ -1097,6 +1099,7 @@ func (repman *ReplicationManager) initFS(conf config.Config) error {
10971099
os.MkdirAll(conf.BaseDir+"/data", os.ModePerm)
10981100
os.MkdirAll(conf.BaseDir+"/share", os.ModePerm)
10991101
}
1102+
repman.LogModulePrintf(repman.Conf.Verbose, config.ConstLogModGeneral, config.LvlInfo, "Embeded run config dir : %s", conf.ConfDir)
11001103

11011104
if _, err := os.Stat(conf.ConfDir + "/config.toml"); os.IsNotExist(err) {
11021105

0 commit comments

Comments
 (0)