remove old watcher and external_watcher

Author: lovehunter9

cmd/backend/app/root.go

@@ -13,7 +13,6 @@ import (
 	"files/pkg/integration"
 	"files/pkg/postgres"
 	"files/pkg/redisutils"
-	"files/pkg/rpc"
 	"files/pkg/tasks"
 	"files/pkg/watchers"
 	"io"
@@ -170,14 +169,7 @@ user created with the credentials from options "username" and "password".`,
 		//		- CleanupOldFilesAndRedisEntries
 		InitCrontabs()
 
-		// step5: BackgroundTask
-		// 		- initRpcServer
-		//		- initWatcher
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		rpc.InitRpcService(ctx)
-
-		// step6: run http server
+		// step5: run http server
 		server := getRunParams(cmd.Flags())
 		setupLog(server.Log)
 
@@ -210,26 +202,26 @@ user created with the credentials from options "username" and "password".`,
 			checkErr(err)
 		}
 
-		// step7: init commands
+		// step6: init commands
 		rclone.NewCommandRclone()
 		rclone.Command.InitServes()
 
-		// step8: build driver handler
+		// step7: build driver handler
 		drivers.NewDriverHandler()
 
-		// step9: init global
+		// step8: init global
 		config := ctrl.GetConfigOrDie()
 		global.InitGlobalData(config)
 		global.InitGlobalNodes(config)
 		global.InitGlobalMounted()
 
-		// step10: init seahub (for test now)
+		// step9: init seahub (for test now)
 		seaserv.InitSeaRPC()
 
-		// step11: integration
+		// step10: integration
 		integration.NewIntegrationManager()
 
-		// step12: watcher
+		// step11: watcher
 		var w = watchers.NewWatchers(context.Background(), config)
 		watchers.AddToWatchers[corev1.Node](w, global.NodeGVR, global.GlobalNode.Handlerevent())
 		watchers.AddToWatchers[appsv1.StatefulSet](w, appsv1.SchemeGroupVersion.WithResource("statefulsets"), global.GlobalData.HandlerEvent())

pkg/http/http.go

@@ -5,12 +5,8 @@ import (
 	"files/pkg/drivers/sync/seahub"
 	"files/pkg/files"
 	"files/pkg/preview"
-	"files/pkg/rpc"
 	"net/http"
 
-	"github.com/gin-gonic/gin"
-	"k8s.io/klog/v2"
-
 	"github.com/gorilla/mux"
 )
 
@@ -52,10 +48,6 @@ func NewHandler(
 	uploader.PathPrefix("/file-uploaded-bytes").Handler(wrapperFilesUploadArgs(fileUploadedBytesHandler)).Methods("GET") // recons done
 	uploader.PathPrefix("/upload-link/{uid}").Handler(wrapperFilesUploadArgs(fileUploadChunksHandler)).Methods("POST")
 
-	//uploader.PathPrefix("/upload-link").Handler(monkey(uploadLinkHandler, "/upload/upload-link")).Methods("GET")                    // recons done
-	//uploader.PathPrefix("/file-uploaded-bytes").Handler(monkey(uploadedBytesHandler, "/upload/file-uploaded-bytes")).Methods("GET") // recons done
-	//uploader.PathPrefix("/upload-link/{uid}").Handler(monkey(uploadChunksHandler, "/upload/upload-link")).Methods("POST")           // recons done
-
 	api := r.PathPrefix("/api").Subrouter()
 
 	api.PathPrefix("/nodes").Handler(common(nodesGetHandler)).Methods("GET")
@@ -98,24 +90,10 @@ func NewHandler(
 	api.PathPrefix("/smb_history").Handler(monkey(smbHistoryGetHandler, "/api/smb_history")).Methods("GET")       // no need to recons
 	api.PathPrefix("/smb_history").Handler(monkey(smbHistoryPutHandler, "/api/smb_history")).Methods("PUT")       // no need to recons
 	api.PathPrefix("/smb_history").Handler(monkey(smbHistoryDeleteHandler, "/api/smb_history")).Methods("DELETE") // no need to recons
-	//api.PathPrefix("/smb_history").Handler(monkey(smbHistoryDeleteHandler, "/api/smb_history")).Methods("PATCH")	// recons delete this
-
-	files := r.PathPrefix("/files").Subrouter()
-	files.HandleFunc("/healthcheck", ginHandlerAdapter(rpc.RpcEngine))
 
 	callback := r.PathPrefix("/callback").Subrouter()
 	callback.Path("/create").Handler(monkey(seahub.CallbackCreateHandler, "/callback/create")).Methods("POST")
 	callback.Path("/delete").Handler(monkey(seahub.CallbackDeleteHandler, "/callback/delete")).Methods("POST")
 
 	return stripPrefix(server.BaseURL, r), nil
 }
-
-func ginHandlerAdapter(ginEngine *gin.Engine) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		klog.Infoln("You see me~")
-		klog.Infoln("request: ", r)
-		klog.Infoln("request header: ", r.Header)
-		klog.Infoln("request body: ", r.Body)
-		ginEngine.ServeHTTP(w, r)
-	}
-}