optimize

src/ftpSync/syncFtp.go

@@ -57,16 +57,11 @@ func (obj *SyncFtp) connectFtpServer() bool {
 func (obj *SyncFtp) Init() {
 	obj.syncFtpServer = nil
 	obj.allRemoteFolder = make(map[string]bool, 0)
-
-	if obj.connectFtpServer() == false {
-		return
-	}
-
-	obj.Refresh()
-
 	obj.syncFileChannel = make(chan *SyncFileInfo, 10)
 	obj.syncStopChannel = make(chan bool, 0)
 
+	obj.Refresh()
+
 	go func() {
 		checkInterval := time.NewTicker(time.Second * time.Duration(10))
 		defer func() {
@@ -89,6 +84,7 @@ func (obj *SyncFtp) Init() {
 			case syncFile := <-obj.syncFileChannel:
 				obj.Put(syncFile.LocalFile, syncFile.RemoteFile, syncFile.NumberTimes)
 			case <-obj.syncStopChannel:
+				Logger.Print("syncFtp catch stop signal")
 				break E
 			}
 		}
@@ -226,7 +222,7 @@ func (obj *SyncFtp) listFtpServerFolder(p string, recursion int) []string {
 	folderFiles := make([]string, 0)
 
 	for _, e := range fileEntryList {
-		if e.Type == ftp.EntryTypeLink || InStringArray(e.Name, []string{".", ".."}){
+		if e.Type == ftp.EntryTypeLink || InStringArray(e.Name, []string{".", ".."}) {
 			continue
 		}
 
@@ -286,9 +282,7 @@ func (obj *SyncFtp) ExistsFile(remoteFile string) bool {
 }
 
 func (obj *SyncFtp) Stop() {
-	if obj.syncFtpServer != nil {
-		obj.syncStopChannel <- true
-	}
+	obj.syncStopChannel <- true
 }
 
 var GSyncFtp = &SyncFtp{}

src/ftpSync/syncServer.go

@@ -80,15 +80,15 @@ func (obj *ftpSyncRedisHandler) Exists(remoteFile string) (int, error) {
 }
 
 func Run() {
-	wordsFilterHandler := &ftpSyncRedisHandler{}
+	ftpSyncHandler := &ftpSyncRedisHandler{}
 
-	err := wordsFilterHandler.Init()
+	err := ftpSyncHandler.Init()
 	if err != nil {
 		Logger.Print(err)
 		return
 	}
 
-	wordsFilterServer, err := redis.NewServer(GConfig.ListenServer, wordsFilterHandler)
+	ftpSyncServer, err := redis.NewServer(GConfig.ListenServer, ftpSyncHandler)
 	if err != nil {
 		Logger.Print(err)
 		return
@@ -100,12 +100,13 @@ func Run() {
 
 	go func() {
 		<-stopSignal
-		wordsFilterServer.Stop(10)
+		Logger.Print("catch exit signal")
+		ftpSyncServer.Stop(10)
 		GSyncFtp.Stop()
 		serverStop <- true
 	}()
 
-	err = wordsFilterServer.Start()
+	err = ftpSyncServer.Start()
 	if err != nil {
 		Logger.Print(err)
 		stopSignal <- syscall.SIGTERM