修复bug ，拆分配置文件目录

cmds.go

@@ -77,6 +77,9 @@ func actionStartServer(c *cli.Context) error {
 		if err != nil {
 			log.Fatal(err)
 		}
+		if err := ioutil.WriteFile("/var/run/gosuv.pid", []byte(strconv.Itoa(cmd.Process.Pid)), 0644); err != nil {
+			log.Fatalln(err)
+		}
 		select {
 		case err = <-GoFunc(cmd.Wait):
 			log.Fatalf("server started failed, %v", err)

fsm.go

@@ -292,6 +292,7 @@ func (p *Process) waitNextRetry() {
 	if p.retryLeft <= 0 {
 		p.retryLeft = p.StartRetries
 		p.SetState(Fatal)
+		p.cmd = nil
 		return
 	}
 	p.retryLeft -= 1
@@ -353,6 +354,7 @@ func (p *Process) startCommand() {
 	if err := p.cmd.Start(); err != nil {
 		log.Warnf("program %s start failed: %v", p.Name, err)
 		p.SetState(Fatal)
+		p.cmd = nil
 		return
 	}
 	// 如果是running状态，重置 retryLeft
@@ -368,6 +370,7 @@ func (p *Process) startCommand() {
 			if time.Since(startTime) < time.Duration(p.StartSeconds)*time.Second {
 				if p.retryLeft == p.StartRetries { // If first time quit so fast, just set to fatal
 					p.SetState(Fatal)
+					p.cmd = nil
 					p.RunNotification(Fatal)
 					log.Printf("program(%s) exit too quick, status -> fatal", p.Name)
 					return

gosuv.go

@@ -116,7 +116,7 @@ func checkServerStatus() error {
 }
 
 func main() {
-	var defaultConfigPath = filepath.Join(defaultGosuvDir, "config.yml")
+	var defaultConfigPath = filepath.Join(defaultGosuvDir, "conf/config.yml")
 
 	app := cli.NewApp()
 	app.Name = "gosuv"

web.go

@@ -599,7 +599,6 @@ func (s *Supervisor) wsPerf(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			break
 		}
-
 		mainPinfo, err := ps.ProcInfo()
 		if err != nil {
 			break
@@ -650,7 +649,7 @@ func (s *Supervisor) AutoStartPrograms() {
 
 func newSupervisorHandler() (suv *Supervisor, hdlr http.Handler, err error) {
 	suv = &Supervisor{
-		ConfigDir: defaultGosuvDir,
+		ConfigDir: filepath.Join(defaultGosuvDir, "conf"),
 		pgMap:     make(map[string]Program, 0),
 		procMap:   make(map[string]*Process, 0),
 		eventB:    NewWriteBroadcaster(4 * 1024),