Revert "LP#1729610: return new OpenSRF status if backlog queue fills up"

This reverts commit efa9b713d5341458a3afaa26d1cf9e750fa78654.

diff --git a/include/opensrf/osrf_message.h b/include/opensrf/osrf_message.h
index 874c310..1785adf 100644 (file)
--- a/include/opensrf/osrf_message.h
+++ b/include/opensrf/osrf_message.h
@@ -53,7 +53,6 @@ extern "C" {
 
 #define OSRF_STATUS_INTERNALSERVERERROR  500
 #define OSRF_STATUS_NOTIMPLEMENTED       501
-#define OSRF_STATUS_SERVICEUNAVAILABLE   503
 #define OSRF_STATUS_VERSIONNOTSUPPORTED  505
 
 

diff --git a/src/javascript/opensrf.js b/src/javascript/opensrf.js
index 03c79a9..e18efa5 100644 (file)
--- a/src/javascript/opensrf.js
+++ b/src/javascript/opensrf.js
@@ -58,7 +58,6 @@ var OSRF_STATUS_TIMEOUT = 408;
 var OSRF_STATUS_EXPFAILED = 417;
 var OSRF_STATUS_INTERNALSERVERERROR = 500;
 var OSRF_STATUS_NOTIMPLEMENTED = 501;
-var OSRF_STATUS_SERVICEUNAVAILABLE = 503;
 var OSRF_STATUS_VERSIONNOTSUPPORTED = 505;
 
 // TODO: get path from ./configure prefix

diff --git a/src/perl/lib/OpenSRF/DomainObject/oilsResponse.pm b/src/perl/lib/OpenSRF/DomainObject/oilsResponse.pm
index 80fc7d2..874a4ae 100644 (file)
--- a/src/perl/lib/OpenSRF/DomainObject/oilsResponse.pm
+++ b/src/perl/lib/OpenSRF/DomainObject/oilsResponse.pm
@@ -12,7 +12,6 @@ BEGIN {
                                        STATUS_BADREQUEST STATUS_UNAUTHORIZED STATUS_FORBIDDEN
                                        STATUS_NOTFOUND STATUS_NOTALLOWED STATUS_TIMEOUT
                                        STATUS_INTERNALSERVERERROR STATUS_NOTIMPLEMENTED
-                                       STATUS_SERVICEUNAVAILABLE
                                        STATUS_VERSIONNOTSUPPORTED STATUS_REDIRECTED 
                                        STATUS_EXPFAILED STATUS_COMPLETE STATUS_PARTIAL
                                        STATUS_NOCONTENT/;
@@ -22,7 +21,6 @@ BEGIN {
                                        STATUS_BADREQUEST STATUS_UNAUTHORIZED STATUS_FORBIDDEN
                                        STATUS_NOTFOUND STATUS_NOTALLOWED STATUS_TIMEOUT
                                        STATUS_INTERNALSERVERERROR STATUS_NOTIMPLEMENTED
-                                       STATUS_SERVICEUNAVAILABLE
                                        STATUS_VERSIONNOTSUPPORTED STATUS_REDIRECTED 
                                        STATUS_EXPFAILED STATUS_COMPLETE STATUS_PARTIAL
                                        STATUS_NOCONTENT/ ],
@@ -74,7 +72,6 @@ sub STATUS_EXPFAILED          { return 417 }
 
 sub STATUS_INTERNALSERVERERROR { return 500 }
 sub STATUS_NOTIMPLEMENTED                      { return 501 }
-sub STATUS_SERVICEUNAVAILABLE  { return 503 }
 sub STATUS_VERSIONNOTSUPPORTED { return 505 }
 
 my $log = 'OpenSRF::Utils::Logger';

diff --git a/src/perl/lib/OpenSRF/Server.pm b/src/perl/lib/OpenSRF/Server.pm
index b0386fc..6f3981f 100644 (file)
--- a/src/perl/lib/OpenSRF/Server.pm
+++ b/src/perl/lib/OpenSRF/Server.pm
@@ -21,7 +21,6 @@ use OpenSRF::Utils::Config;
 use OpenSRF::Transport::PeerHandle;
 use OpenSRF::Utils::SettingsClient;
 use OpenSRF::Utils::Logger qw($logger);
-use OpenSRF::DomainObject::oilsResponse qw/:status/;
 use OpenSRF::Transport::SlimJabber::Client;
 use Encode;
 use POSIX qw/:sys_wait_h :errno_h/;