diff options
author | Israel Madueme <purelogiq@gmail.com> | 2018-04-05 22:23:43 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-05 22:23:43 +0200 |
commit | 755bc194dcea3481fa41b5884a98a5aa086fe09e (patch) | |
tree | 37d05c7b269ce615c92014ac057b97291768d255 /Bugzilla | |
parent | 412052f3c46e05b19104622157c38b669fc00118 (diff) | |
download | bugzilla-755bc194dcea3481fa41b5884a98a5aa086fe09e.tar.gz bugzilla-755bc194dcea3481fa41b5884a98a5aa086fe09e.tar.xz |
Bug 1449282 - add jobqueue_status api
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/WebService/Bugzilla.pm | 38 | ||||
-rw-r--r-- | Bugzilla/WebService/Constants.pm | 3 | ||||
-rw-r--r-- | Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm | 5 |
3 files changed, 46 insertions, 0 deletions
diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm index 0d0393c28..145502445 100644 --- a/Bugzilla/WebService/Bugzilla.pm +++ b/Bugzilla/WebService/Bugzilla.pm @@ -13,7 +13,10 @@ use warnings; use base qw(Bugzilla::WebService); use Bugzilla::Constants; +use Bugzilla::Error; +use Bugzilla::Logging; use Bugzilla::Util qw(datetime_from); +use Try::Tiny; use DateTime; @@ -28,6 +31,7 @@ use constant READ_ONLY => qw( timezone time version + jobqueue_status ); use constant PUBLIC_METHODS => qw( @@ -35,6 +39,7 @@ use constant PUBLIC_METHODS => qw( time timezone version + jobqueue_status ); sub version { @@ -80,6 +85,39 @@ sub time { }; } +sub jobqueue_status { + my ( $self, $params ) = @_; + + Bugzilla->login(LOGIN_REQUIRED); + + my $dbh = Bugzilla->dbh; + my $query = q{ + SELECT + COUNT(*) AS total, + COALESCE( + (SELECT COUNT(*) + FROM ts_error + WHERE ts_error.jobid = j.jobid + ) + , 0) AS errors + FROM ts_job j + INNER JOIN ts_funcmap f + ON f.funcid = j.funcid; + }; + + my $status; + try { + $status = $dbh->selectrow_hashref($query); + $status->{errors} = 0 + $status->{errors}; + $status->{total} = 0 + $status->{total}; + } catch { + ERROR($_); + ThrowCodeError('jobqueue_status_error'); + }; + + return $status; +} + 1; __END__ diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm index 93fddfc2b..71435c13a 100644 --- a/Bugzilla/WebService/Constants.pm +++ b/Bugzilla/WebService/Constants.pm @@ -199,6 +199,9 @@ use constant WS_ERROR_CODE => { # BugUserLastVisited errors user_not_involved => 1300, + # Job queue errors 1400-1500 + jobqueue_status_error => 1400, + # Errors thrown by the WebService itself. The ones that are negative # conform to http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php xmlrpc_invalid_value => -32600, diff --git a/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm b/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm index a8f3f9330..646355cd3 100644 --- a/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm +++ b/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm @@ -49,6 +49,11 @@ sub _rest_resources { GET => { method => 'parameters' } + }, + qr{^/jobqueue_status$}, { + GET => { + method => 'jobqueue_status' + } } ]; return $rest_resources; |