Reduced logging

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>nl.knmi.adagucservices</groupId>
 	<artifactId>adaguc-services</artifactId>
-	<version>1.2.11</version>
+	<version>1.2.12</version>
 
 	<name>adaguc-services</name>
 	<description>Backend for adaguc-server and adaguc-viewer</description>

src/main/java/nl/knmi/adaguc/security/AuthenticatorImpl.java

@@ -74,7 +74,7 @@ public synchronized void init(HttpServletRequest request) {
 		}
 
 		x509 = new PemX509Tools().getUserIdFromCertificate(request);
-		Debug.println("No user info found from certificates");
+		// Debug.println("No user info found from certificates");
 		if(x509 == null){
 			String path = request.getServletPath();
 
@@ -84,7 +84,7 @@ public synchronized void init(HttpServletRequest request) {
 				try {
 					tokenStr = HTTPTools.getHTTPParam(request, "key");
 				} catch (Exception e1) {
-					Debug.println("No access token set in URL via key=<accesstoken> KVP");
+					// Debug.println("No access token set in URL via key=<accesstoken> KVP");
 				}
 			}
 
@@ -100,7 +100,7 @@ public synchronized void init(HttpServletRequest request) {
 
 
 			}else{
-				Debug.println("Unable to find user info from certificate or accesstoken");
+				// Debug.println("Unable to find user info from certificate or accesstoken");
 			}
 
 

src/main/java/nl/knmi/adaguc/services/adagucserver/ADAGUCRequestMapper.java

@@ -22,7 +22,7 @@ public class ADAGUCRequestMapper {
 	@CrossOrigin
 	@RequestMapping("wms")
 	public void ADAGUCSERVERWMS(HttpServletResponse response, HttpServletRequest request) {
-		Debug.println("#### SERVLET /wms ####");
+		// Debug.println("#### SERVLET /wms ####");
 		try {
 			ADAGUCServer.runADAGUCWMS(request, response, null, null);
 		} catch (Exception e) {

src/main/java/nl/knmi/adaguc/services/adagucserver/ADAGUCServer.java

@@ -84,7 +84,7 @@ enum ADAGUCServiceType {
 
 	public static void runADAGUC(HttpServletRequest request, HttpServletResponse response, String queryString,
 			OutputStream outputStream, ADAGUCServiceType serviceType) throws Exception {
-		Debug.println("runADAGUC");
+		// Debug.println("runADAGUC");
 		int maxInstances = ADAGUCConfigurator.getMaxInstances();
 		int maxInstancesInQueue = ADAGUCConfigurator.getMaxInstancesInQueue();
 		Exception exception = null;
@@ -154,7 +154,7 @@ private static void _runADAGUC(HttpServletRequest request, HttpServletResponse r
 			try {
 				userHomeDir = UserManager.getUser(authenticator).getHomeDir();
 			} catch (Exception e) {
-				Debug.println("No user information provided: " + e.getMessage());
+				// Debug.println("No user information provided: " + e.getMessage());
 			}
 
 		}
@@ -197,7 +197,7 @@ private static void _runADAGUC(HttpServletRequest request, HttpServletResponse r
 		Tools.mksubdirs(tmpDir);
 		environmentVariables.add("ADAGUC_TMP=" + tmpDir);
 		String tmpLogFile = tmpDir + "adaguc-server-cgi-log" + instanceId;
-		Debug.println("Logging to " + tmpLogFile);
+		// Debug.println("Logging to " + tmpLogFile);
 		environmentVariables.add("ADAGUC_LOGFILE=" + tmpLogFile);
 		environmentVariables.add("HOME=" + userHomeDir);
 		environmentVariables.add("QUERY_STRING=" + queryString);

src/main/java/nl/knmi/adaguc/tools/CGIRunner.java

@@ -33,7 +33,7 @@ public class CGIRunner {
 	public static int runCGIProgram(String[] commands, String[] environmentVariables, String directory,
 			final HttpServletResponse response, OutputStream outputStream, String postData, long timeOutMs)
 			throws InterruptedException, IOException {
-		Debug.println("Working Directory: " + directory);
+		// Debug.println("Working Directory: " + directory);
 
 		class StderrPrinter implements ProcessRunner.StatusPrinterInterface {
 			StringBuffer errorMessages = new StringBuffer();
@@ -175,9 +175,10 @@ public void setPID(String pid) {
 				timeOutMs);
 
 		long startTimeInMillis = Calendar.getInstance().getTimeInMillis();
-		Debug.println("Starting CGI.");
+
 
 		processRunner.runProcess(commands, postData);
+		 //Debug.println("Starting CGI");
 		long stopTimeInMillis = Calendar.getInstance().getTimeInMillis();
 		if (processRunner.exitValue() != 0) {
 			Debug.errprintln("Warning: exit code: " + processRunner.exitValue());
@@ -217,7 +218,7 @@ public void setPID(String pid) {
 			}
 		}
 
-		Debug.println("Finished CGI with code " + processRunner.exitValue() + ": " + " ("
+		Debug.println("Finished CGI process with code " +  processRunner.exitValue() + ": " + " ("
 				+ (stopTimeInMillis - startTimeInMillis) + " ms)");
 		try {
 			outputStream.flush();