diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-07-25 00:03:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 18:03:58 +0200 |
| commit | 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 (patch) | |
| tree | 6f27dc68a35d1f9d806c632e36f0edc8543184ea /modules/task | |
| parent | e0f9635c0691cb67f0fcbb758cabba801d9fc51b (diff) | |
| download | gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.tar.gz gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.zip | |
Add an abstract json layout to make it's easier to change json library (#16528)
* Add an abstract json layout to make it's easier to change json library
* Fix import
* Fix import sequence
* Fix blank lines
* Fix blank lines
Diffstat (limited to 'modules/task')
| -rw-r--r-- | modules/task/migrate.go | 3 | ||||
| -rw-r--r-- | modules/task/task.go | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/modules/task/migrate.go b/modules/task/migrate.go index d7655112d3..481422403b 100644 --- a/modules/task/migrate.go +++ b/modules/task/migrate.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations" migration "code.gitea.io/gitea/modules/migrations/base" @@ -20,7 +21,6 @@ import ( "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - jsoniter "github.com/json-iterator/go" ) func handleCreateError(owner *models.User, err error) error { @@ -112,7 +112,6 @@ func runMigrateTask(t *models.Task) (err error) { Format: format, Args: args, } - json := jsoniter.ConfigCompatibleWithStandardLibrary bs, _ := json.Marshal(message) t.Message = string(bs) _ = t.UpdateCols("message") diff --git a/modules/task/task.go b/modules/task/task.go index 1c0a87e1f6..4e782869f9 100644 --- a/modules/task/task.go +++ b/modules/task/task.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/queue" @@ -18,7 +19,6 @@ import ( "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - jsoniter "github.com/json-iterator/go" ) // taskQueue is a global queue of tasks @@ -85,8 +85,6 @@ func CreateMigrateTask(doer, u *models.User, opts base.MigrateOptions) (*models. return nil, err } opts.AuthToken = "" - - json := jsoniter.ConfigCompatibleWithStandardLibrary bs, err := json.Marshal(&opts) if err != nil { return nil, err |