From a855abf8c0de73fb3a9913000e1eb8d8ea9840ff Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 30 Mar 2018 01:26:36 -0400 Subject: models: rename RewriteAllPublicKeys -> RewriteAuthorizedKeys --- models/ssh_key.go | 8 +++++--- models/user.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'models') diff --git a/models/ssh_key.go b/models/ssh_key.go index 6c35b70a..350c5f75 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -512,16 +512,18 @@ func DeletePublicKey(doer *User, id int64) (err error) { return err } - return RewriteAllPublicKeys() + return RewriteAuthorizedKeys() } -// RewriteAllPublicKeys removes any authorized key and rewrite all keys from database again. +// RewriteAuthorizedKeys removes any authorized key and rewrite all keys from database again. // Note: x.Iterate does not get latest data after insert/delete, so we have to call this function // outsite any session scope independently. -func RewriteAllPublicKeys() error { +func RewriteAuthorizedKeys() error { sshOpLocker.Lock() defer sshOpLocker.Unlock() + log.Trace("Doing: RewriteAuthorizedKeys") + os.MkdirAll(setting.SSH.RootPath, os.ModePerm) fpath := filepath.Join(setting.SSH.RootPath, "authorized_keys") tmpPath := fpath + ".tmp" diff --git a/models/user.go b/models/user.go index 4b97e911..831ba3f4 100644 --- a/models/user.go +++ b/models/user.go @@ -853,7 +853,7 @@ func DeleteUser(u *User) (err error) { return err } - return RewriteAllPublicKeys() + return RewriteAuthorizedKeys() } // DeleteInactivateUsers deletes all inactivate users and email addresses. -- cgit v1.2.3