diff options
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 | ||||
| -rw-r--r-- | templates/admin/queue.tmpl | 8 | ||||
| -rw-r--r-- | templates/admin/queue_manage.tmpl | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 66f67d4896..08aa320cc2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3164,10 +3164,10 @@ monitor.queue.name = Name monitor.queue.type = Type monitor.queue.exemplar = Exemplar Type monitor.queue.numberworkers = Number of Workers +monitor.queue.activeworkers = Active Workers monitor.queue.maxnumberworkers = Max Number of Workers monitor.queue.numberinqueue = Number in Queue -monitor.queue.review = Review Config -monitor.queue.review_add = Review/Add Workers +monitor.queue.review_add = Review / Add Workers monitor.queue.settings.title = Pool Settings monitor.queue.settings.desc = Pools dynamically grow in response to their worker queue blocking. monitor.queue.settings.maxnumberworkers = Max Number of workers diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index 4ed9dbb9aa..efca8c1f2f 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -11,6 +11,7 @@ <th>{{.locale.Tr "admin.monitor.queue.type"}}</th> <th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th> <th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th> + <th>{{.locale.Tr "admin.monitor.queue.activeworkers"}}</th> <th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th> <th></th> </tr> @@ -21,9 +22,10 @@ <td>{{$q.GetName}}</td> <td>{{$q.GetType}}</td> <td>{{$q.GetItemTypeName}}</td> - <td>{{$sum := $q.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> - <td>{{$sum = $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> - <td><a href="{{$.Link}}/{{$qid}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a></td> + <td>{{$q.GetWorkerNumber}}</td> + <td>{{$q.GetWorkerActiveNumber}}</td> + <td>{{$sum := $q.GetQueueItemNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> + <td><a href="{{$.Link}}/{{$qid}}" class="button">{{$.locale.Tr "admin.monitor.queue.review_add"}}</a></td> </tr> {{end}} </tbody> diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index c8ae07a19a..a46d9462ec 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -11,6 +11,7 @@ <th>{{.locale.Tr "admin.monitor.queue.type"}}</th> <th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th> <th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th> + <th>{{.locale.Tr "admin.monitor.queue.activeworkers"}}</th> <th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th> <th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th> </tr> @@ -20,10 +21,11 @@ <td>{{.Queue.GetName}}</td> <td>{{.Queue.GetType}}</td> <td>{{.Queue.GetItemTypeName}}</td> - <td>{{$sum := .Queue.GetWorkerNumber}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td> - <td>{{if lt $sum 0}}-{{else}}{{.Queue.GetWorkerMaxNumber}}{{end}}</td> + <td>{{.Queue.GetWorkerNumber}}</td> + <td>{{.Queue.GetWorkerActiveNumber}}</td> + <td>{{.Queue.GetWorkerMaxNumber}}</td> <td> - {{$sum = .Queue.GetQueueItemNumber}} + {{$sum := .Queue.GetQueueItemNumber}} {{if lt $sum 0}} - {{else}} |