From 151a7643ced3a022d78eab0f6a4cf34b19928a7a Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Mon, 10 Dec 2012 16:27:33 -0800 Subject: [PATCH] api: Don't silently fail apiserver instance initialization - ApiServer instance assumes cloudstartup servlet will initialize it - Check and log if initialization fails Signed-off-by: Rohit Yadav --- server/src/com/cloud/api/ApiServer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index bb14d4c5dd0..693ab1e91c5 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -121,7 +121,6 @@ import com.cloud.utils.exception.CSExceptionErrorCode; import com.cloud.uuididentity.dao.IdentityDao; import com.cloud.acl.APIAccessChecker; - public class ApiServer implements HttpRequestHandler { private static final Logger s_logger = Logger.getLogger(ApiServer.class.getName()); private static final Logger s_accessLogger = Logger.getLogger("apiserver." + ApiServer.class.getName()); @@ -143,7 +142,6 @@ public class ApiServer implements HttpRequestHandler { private static ExecutorService _executor = new ThreadPoolExecutor(10, 150, 60, TimeUnit.SECONDS, new LinkedBlockingQueue(), new NamedThreadFactory("ApiServer")); - private ApiServer() { } @@ -155,11 +153,14 @@ public class ApiServer implements HttpRequestHandler { } public static ApiServer getInstance() { - // initApiServer(); + // Assumption: CloudStartupServlet would initialize ApiServer + // initApiServer(null); + if (s_instance == null) { + s_logger.fatal("ApiServer instance failed to initialize"); + } return s_instance; } - public void init(String[] apiConfig) { BaseCmd.setComponents(new ApiResponseHelper()); BaseListCmd.configure(); @@ -908,7 +909,6 @@ public class ApiServer implements HttpRequestHandler { public String getSerializedApiError(int errorCode, String errorText, Map apiCommandParams, String responseType, Exception ex) { String responseName = null; String cmdClassName = null; - String responseText = null; try {