also do models.RewriteAllPublicKeys

Author: wxiaoguang

modules/appstate/file.go

@@ -35,7 +35,7 @@ func (f *FileStore) Get(item StateItem) error {
 	return e
 }
 
-//Set saves the state item
+// Set saves the state item
 func (f *FileStore) Set(item StateItem) error {
 	b, e := json.Marshal(item)
 	if e != nil {
@@ -44,12 +44,12 @@ func (f *FileStore) Set(item StateItem) error {
 	return ioutil.WriteFile(f.genFilePath(item), b, fs.FileMode(0644))
 }
 
-//Delete removes the state item
+// Delete removes the state item
 func (f *FileStore) Delete(item StateItem) error {
 	return os.Remove(f.genFilePath(item))
 }
 
-//NewFileStore returns a new file store
+// NewFileStore returns a new file store
 func NewFileStore(path string) (*FileStore, error) {
 	_ = os.Mkdir(path, fs.FileMode(0755))
 	if _, err := os.Stat(path); err != nil {

modules/appstate/item_runtime.go

@@ -9,7 +9,7 @@ type RuntimeState struct {
 	LastAppPath string `json:"last_app_path"`
 }
 
-//Name returns the item name
+// Name returns the item name
 func (a RuntimeState) Name() string {
 	return "runtime-state"
 }

routers/init.go

@@ -74,17 +74,18 @@ func InitGitServices() {
 	guaranteeInit(repository.NewContext)
 }
 
-func syncAppPathForGitHooks(ctx context.Context) (err error) {
+func syncAppPathForGit(ctx context.Context) (err error) {
 	runtimeState := new(appstate.RuntimeState)
 	if err = setting.AppState.Get(runtimeState); err != nil {
 		return err
 	}
 	if runtimeState.LastAppPath != setting.AppPath {
 		log.Info("AppPath changed from '%s' to '%s', sync repository hooks ...", runtimeState.LastAppPath, setting.AppPath)
-		err = repo_module.SyncRepositoryHooks(ctx)
-		if err != nil {
-			return err
-		}
+		guaranteeInitCtx(ctx, repo_module.SyncRepositoryHooks)
+
+		log.Info("AppPath changed from '%s' to '%s', sync ssh keys ...", runtimeState.LastAppPath, setting.AppPath)
+		guaranteeInit(models.RewriteAllPublicKeys)
+
 		runtimeState.LastAppPath = setting.AppPath
 		return setting.AppState.Set(runtimeState)
 	}
@@ -148,7 +149,7 @@ func GlobalInit(ctx context.Context) {
 	guaranteeInit(repo_migrations.Init)
 	eventsource.GetManager().Init()
 
-	guaranteeInitCtx(ctx, syncAppPathForGitHooks)
+	guaranteeInitCtx(ctx, syncAppPathForGit)
 
 	if setting.SSH.StartBuiltinServer {
 		ssh.Listen(setting.SSH.ListenHost, setting.SSH.ListenPort, setting.SSH.ServerCiphers, setting.SSH.ServerKeyExchanges, setting.SSH.ServerMACs)