Skip to content

Commit 0184bd1

Browse files
GiteaBotxor-gatewxiaoguang
authored
Fixup app.example.ini for task section, which is now queue.task (go-gitea#30555) (go-gitea#30563)
Backport go-gitea#30555 by xor-gate Config section `[task]` has been deprecated in favor of `[queue.task]` Co-authored-by: Jerry Jacobs <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent 4fec3a3 commit 0184bd1

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

custom/conf/app.example.ini

-16
Original file line numberDiff line numberDiff line change
@@ -2369,22 +2369,6 @@ LEVEL = Info
23692369
;; Enable issue by repository metrics; default is false
23702370
;ENABLED_ISSUE_BY_REPOSITORY = false
23712371

2372-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2373-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2374-
;[task]
2375-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2376-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2377-
;;
2378-
;; Task queue type, could be `channel` or `redis`.
2379-
;QUEUE_TYPE = channel
2380-
;;
2381-
;; Task queue length, available only when `QUEUE_TYPE` is `channel`.
2382-
;QUEUE_LENGTH = 1000
2383-
;;
2384-
;; Task queue connection string, available only when `QUEUE_TYPE` is `redis`.
2385-
;; If there is a password of redis, use `redis://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s` or `redis+cluster://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s` for `redis-clsuter`.
2386-
;QUEUE_CONN_STR = "redis://127.0.0.1:6379/0?pool_size=100&idle_timeout=180s"
2387-
23882372
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23892373
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
23902374
;[migrations]

docs/content/administration/config-cheat-sheet.en-us.md

-8
Original file line numberDiff line numberDiff line change
@@ -1193,14 +1193,6 @@ in this mapping or the filetype using heuristics.
11931193

11941194
- `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Asia/Shanghai
11951195

1196-
## Task (`task`)
1197-
1198-
Task queue configuration has been moved to `queue.task`. However, the below configuration values are kept for backwards compatibility:
1199-
1200-
- `QUEUE_TYPE`: **channel**: Task queue type, could be `channel` or `redis`.
1201-
- `QUEUE_LENGTH`: **1000**: Task queue length, available only when `QUEUE_TYPE` is `channel`.
1202-
- `QUEUE_CONN_STR`: **redis://127.0.0.1:6379/0**: Task queue connection string, available only when `QUEUE_TYPE` is `redis`. If redis needs a password, use `redis://[email protected]:6379/0` or `redis+cluster://[email protected]:6379/0`.
1203-
12041196
## Migrations (`migrations`)
12051197

12061198
- `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations.

docs/content/administration/config-cheat-sheet.zh-cn.md

-9
Original file line numberDiff line numberDiff line change
@@ -1128,15 +1128,6 @@ ALLOW_DATA_URI_IMAGES = true
11281128

11291129
- `DEFAULT_UI_LOCATION`:在 UI 上的默认时间位置,以便我们可以在 UI 上显示正确的用户时间。例如:Asia/Shanghai
11301130

1131-
## 任务 (`task`)
1132-
1133-
任务队列配置已移动到 `queue.task`。然而,以下配置值仍保留以确保向后兼容:
1134-
1135-
- `QUEUE_TYPE`**channel**:任务队列类型,可以是 `channel``redis`
1136-
- `QUEUE_LENGTH`**1000**:任务队列长度,仅在 `QUEUE_TYPE``channel` 时可用。
1137-
- `QUEUE_CONN_STR`**redis://127.0.0.1:6379/0**:任务队列连接字符串,仅在 `QUEUE_TYPE``redis` 时可用。
1138-
如果 redis 需要密码,使用 `redis://[email protected]:6379/0``redis+cluster://[email protected]:6379/0`
1139-
11401131
## 迁移 (`migrations`)
11411132

11421133
- `MAX_ATTEMPTS`**3**:每次 http/https 请求的最大尝试次数(用于迁移)。

0 commit comments

Comments
 (0)