replacer 제거

client/client.go

@@ -405,56 +405,43 @@ func NewClient(standalone bool) (HoustonClient, error) {
 					unmarshal(&dr, resp.Args)
 					logger.Println("args :", dr)
 
-					if dr.Name == myname {
-						if srcdir, replacer, err := hc.prepareUpdateSelf(&dr); err == nil {
-							args := []string{
-								fmt.Sprintf("%d", os.Getpid()),
-								srcdir,
-								filepath.ToSlash(os.Args[0]),
-							}
-							args = append(args, os.Args[1:]...)
-							cmd := exec.Command(replacer, args...)
-							if err := cmd.Start(); err != nil {
-								logger.Println(err)
-							} else {
-								hc.shutdownFunc()
-							}
-						} else {
-							logger.Println(err)
+					hn, _ := os.Hostname()
+
+					if err := hc.deploy(&dr, func(dp *protos.DeployingProgress) {
+						dp.Hostname = hn
+						dp.Name = dr.Name
+						dp.Version = dr.Version
+						op.ReportDeployingProgress(ctx, dp)
+					}); err == nil {
+						if dr.Name == "houston" {
+							// houston.update 다운로드가 완료되었으므로 종료
+							// 종료되고나면 스크립트가 알아서 재 실행
+							hc.Shutdown()
+							return
 						}
+						prog := gatherDeployedPrograms(hc.config.StorageRoot, dr.Name)
+						hc.deploys[dr.Name] = prog
+						op.Refresh(ctx, hc.makeOperationQueryRequest())
+
+						op.ReportDeployingProgress(ctx, &protos.DeployingProgress{
+							Hostname: hn,
+							Name:     dr.Name,
+							Version:  dr.Version,
+							State:    "success",
+							Progress: 0,
+							Total:    0,
+						})
 					} else {
-						hn, _ := os.Hostname()
+						logger.Println(err)
 
-						if err := hc.deploy(&dr, func(dp *protos.DeployingProgress) {
-							dp.Hostname = hn
-							dp.Name = dr.Name
-							dp.Version = dr.Version
-							op.ReportDeployingProgress(ctx, dp)
-						}); err == nil {
-							prog := gatherDeployedPrograms(hc.config.StorageRoot, dr.Name)
-							hc.deploys[dr.Name] = prog
-							op.Refresh(ctx, hc.makeOperationQueryRequest())
-
-							op.ReportDeployingProgress(ctx, &protos.DeployingProgress{
-								Hostname: hn,
-								Name:     dr.Name,
-								Version:  dr.Version,
-								State:    "success",
-								Progress: 0,
-								Total:    0,
-							})
-						} else {
-							logger.Println(err)
-
-							op.ReportDeployingProgress(ctx, &protos.DeployingProgress{
-								Hostname: hn,
-								Name:     dr.Name,
-								Version:  dr.Version,
-								State:    "fail:" + err.Error(),
-								Progress: 0,
-								Total:    0,
-							})
-						}
+						op.ReportDeployingProgress(ctx, &protos.DeployingProgress{
+							Hostname: hn,
+							Name:     dr.Name,
+							Version:  dr.Version,
+							State:    "fail:" + err.Error(),
+							Progress: 0,
+							Total:    0,
+						})
 					}
 
 				case shared.Withdraw: