Logging mechanism in UI plug-in

14 files changed, 87 insertions, 78 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
index a45c2c2d..716d3b65 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
@@ -22,8 +22,6 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;

 import javax.ws.rs.core.Response;

 

-import org.apache.log4j.Logger;

-

 import com.gluster.storage.management.client.utils.ClientUtil;

 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;

 import com.sun.jersey.api.client.Client;

@@ -40,7 +38,6 @@ import com.sun.jersey.multipart.FormDataMultiPart;
 public abstract class AbstractClient {

 	private static final String HTTP_HEADER_AUTH = "Authorization";

 	protected static final MultivaluedMap<String, String> NO_PARAMS = new MultivaluedMapImpl();

-	private static final Logger logger = Logger.getLogger(AbstractClient.class);

 	protected static String clusterName;

 	protected static String securityToken;

 	protected WebResource resource;

@@ -136,7 +133,6 @@ public abstract class AbstractClient {
 			return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML)

 					.get(responseClass);

 		} catch (Exception e1) {

-			logger.error("Error in fetching response", e1);

 			throw createGlusterException(e1);

 		}

 	}

@@ -175,7 +171,6 @@ public abstract class AbstractClient {
 				throw new GlusterRuntimeException(response.getEntity(String.class));

 			}

 		} catch (Exception e1) {

-			logger.error("Error in downloading resource [" + res.toString() + "]", e1);

 			throw createGlusterException(e1);

 		}

 		

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
index 5144b6ba..6722708b 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
@@ -18,8 +18,6 @@
  *******************************************************************************/
 package com.gluster.storage.management.client;
 
-import org.apache.log4j.Logger;
-
 import com.gluster.storage.management.core.model.Status;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.Base64;
@@ -29,7 +27,6 @@ public class UsersClient extends AbstractClient {
 	private static final String RESOURCE_NAME = "users";
 	private static final String FORM_PARAM_OLD_PASSWORD = "oldpassword";
 	private static final String FORM_PARAM_NEW_PASSWORD = "newpassword";
-	private static final Logger logger = Logger.getLogger(UsersClient.class);
 
 	private String generateSecurityToken(String user, String password) {
 		return new String(Base64.encode(user + ":" + password));
diff --git a/src/com.gluster.storage.management.core/.classpath b/src/com.gluster.storage.management.core/.classpath
index 221aeec4..b41cbcdb 100644
--- a/src/com.gluster.storage.management.core/.classpath
+++ b/src/com.gluster.storage.management.core/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="junit"/>
diff --git a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
index fae660fb..b4431f53 100644
--- a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
+++ b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
@@ -9,8 +9,6 @@ Export-Package: com.gluster.storage.management.core.constants,
  com.gluster.storage.management.core.exceptions,
  com.gluster.storage.management.core.model,
  com.gluster.storage.management.core.response,
- com.gluster.storage.management.core.utils,
- org.apache.log4j
+ com.gluster.storage.management.core.utils
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
-Bundle-ClassPath: lib/log4j-1.2.16.jar,
- .
+Bundle-ClassPath: .
diff --git a/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar b/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar
deleted file mode 100644
index 3f9d8476..00000000
--- a/src/com.gluster.storage.management.core/lib/log4j-1.2.16.jar
+++ /dev/null
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
index 4a21dba7..d301ad10 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
 
@@ -62,6 +61,7 @@ import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.model.VolumeOptionInfo;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 import com.gluster.storage.management.gui.preferences.PreferenceConstants;
+import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 public class GlusterDataModelManager {
 	private static GlusterDataModelManager instance = new GlusterDataModelManager();
@@ -71,7 +71,7 @@ public class GlusterDataModelManager {
 	private List<VolumeOptionInfo> volumeOptionsDefaults;
 	private String clusterName;
  	private static Boolean syncInProgress = false;
-	private static final Logger logger = Logger.getLogger(GlusterDataModelManager.class);
+ 	private static final GlusterLogger logger = GlusterLogger.getInstance();;
 
 	private GlusterDataModelManager() {
 	}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java
index ef7d0979..1dff0a2c 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AbstractActionDelegate.java
@@ -18,21 +18,18 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.actions;
 
-import org.apache.log4j.Logger;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.UIPlugin;
 
 import com.gluster.storage.management.core.model.Entity;
+import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 /**
  * All action delegates in the application should extend from this class. It provides common functionality of grabbing
@@ -42,7 +39,7 @@ import com.gluster.storage.management.core.model.Entity;
 @SuppressWarnings("restriction")
 public abstract class AbstractActionDelegate implements IWorkbenchWindowActionDelegate {
 	protected IWorkbenchWindow window;
-	protected Logger logger = Logger.getLogger(this.getClass());
+	protected static final GlusterLogger logger = GlusterLogger.getInstance();
 	
 	// the latest selected entity
 	protected Entity selectedEntity;
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
index 105af60d..1eda54af 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
@@ -1,9 +1,6 @@
 package com.gluster.storage.management.gui.actions;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.custom.BusyIndicator;
@@ -11,7 +8,6 @@ import org.eclipse.swt.widgets.Display;
 
 import com.gluster.storage.management.client.TasksClient;
 import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.TaskInfo;
 import com.gluster.storage.management.core.model.TaskStatus;
@@ -46,8 +42,9 @@ public class CommitTaskAction extends AbstractActionDelegate {
 					
 					modelManager.volumeChanged(oldVolume, newVolume);
 				} catch (Exception e) {
-					logger.error(e);
-					showInfoDialog(actionDesc, "Volume brick update failed! [" + e.getMessage() + "]");
+					String errMsg = "Volume brick update failed! [" + e.getMessage() + "]";
+					logger.error(errMsg, e);
+					showInfoDialog(actionDesc, errMsg);
 				}
 			}
 		});
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java
index cb6137d2..add769dd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java
@@ -1,12 +1,12 @@
 package com.gluster.storage.management.gui.actions;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.action.IAction;
 
 import com.gluster.storage.management.gui.dialogs.ServerAdditionDialog;
+import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 public class ServerAdditionAction extends AbstractActionDelegate {
-	private static final Logger logger = Logger.getLogger(ServerAdditionAction.class);
+	private static final GlusterLogger logger = GlusterLogger.getInstance();
 	@Override
 	public void dispose() {
 		// TODO Auto-generated method stub
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
index e38ac1cf..1f95fb20 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/jobs/DataSyncJob.java
@@ -18,7 +18,6 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.jobs;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -27,12 +26,13 @@ import org.eclipse.swt.widgets.Display;
 
 import com.gluster.storage.management.core.model.GlusterDataModel;
 import com.gluster.storage.management.gui.GlusterDataModelManager;
+import com.gluster.storage.management.gui.utils.GlusterLogger;
 
 /**
  *
  */
 public class DataSyncJob extends Job {
-	private static final Logger logger = Logger.getLogger(DataSyncJob.class);
+	private static final GlusterLogger logger = GlusterLogger.getInstance();
 
 	public DataSyncJob(String name) {
 		super(name);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterLogger.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterLogger.java
new file mode 100644
index 00000000..1d9b7d2f
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GlusterLogger.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *  
+ * Gluster Management Console is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+package com.gluster.storage.management.gui.utils;
+
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+import com.gluster.storage.management.gui.Activator;
+
+/**
+ *
+ */
+public class GlusterLogger {
+	private static final ILog log = Activator.getDefault().getLog();
+	private static GlusterLogger instance = new GlusterLogger();
+	
+	private GlusterLogger() {
+	}
+	
+	public static GlusterLogger getInstance() {
+		return instance;
+	}
+
+	private void log(String message, int severity, Throwable t) {
+		log.log(new Status(severity, Activator.PLUGIN_ID, message, t));
+	}
+
+	public void error(String message) {
+		log(message, Status.ERROR, null);
+	}
+
+	public void error(String message, Throwable t) {
+		log(message, Status.ERROR, t);
+	}
+
+	public void warn(String message) {
+		log(message, Status.WARNING, null);
+	}
+
+	public void warn(String message, Throwable t) {
+		log(message, Status.WARNING, t);
+	}
+
+	public void info(String message) {
+		log(message, Status.INFO, null);
+	}
+	
+	public void info(String message, Throwable t) {
+		log(message, Status.INFO, t);
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
index 2c83fed2..2339d814 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServerSummaryView.java
@@ -23,7 +23,6 @@ package com.gluster.storage.management.gui.views;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 import org.eclipse.birt.chart.util.CDateTime;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -69,6 +68,7 @@ import com.gluster.storage.management.gui.utils.ChartUtil;
 import com.gluster.storage.management.gui.utils.ChartUtil.ChartPeriodLinkListener;
 import com.gluster.storage.management.gui.utils.ChartViewerComposite;
 import com.gluster.storage.management.gui.utils.GUIHelper;
+import com.gluster.storage.management.gui.utils.GlusterLogger;
 import com.ibm.icu.util.Calendar;
 import com.richclientgui.toolbox.gauges.CoolGauge;
 
@@ -81,7 +81,7 @@ public class GlusterServerSummaryView extends ViewPart {
 	private ClusterListener clusterListener;
 	private static final int CHART_WIDTH = 350;
 	private static final int CHART_HEIGHT = 250;
-	private static final Logger logger = Logger.getLogger(GlusterServerSummaryView.class);
+	private static final GlusterLogger logger = GlusterLogger.getInstance();
 	private static final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
 
 	public enum NETWORK_INTERFACE_TABLE_COLUMN_INDICES {
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/BrickMigrationStatusTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/BrickMigrationStatusTask.java
deleted file mode 100644
index 0f00ad3a..00000000
--- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/BrickMigrationStatusTask.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * DiskMigrationStatusTask.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.server.tasks;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.server.resources.v1_0.TasksResource;
-
-@Component
-public class BrickMigrationStatusTask {
-
-	@Autowired
-	private TasksResource tasksResource;
-	
-	public void checkMigrationStatus() {
-		for (Task task : tasksResource.getAllTasks() ) {
-			if (task.getType() == TASK_TYPE.BRICK_MIGRATE && ((MigrateBrickTask) task).getAutoCommit()) {
-				tasksResource.getTaskStatus( task.getId());
-			}
-		}
-	}
-}
diff --git a/src/com.gluster.storage.management.server/src/log4j.properties b/src/com.gluster.storage.management.server/src/log4j.properties
index f84009d3..18e2e8b1 100644
--- a/src/com.gluster.storage.management.server/src/log4j.properties
+++ b/src/com.gluster.storage.management.server/src/log4j.properties
@@ -8,12 +8,12 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t - %m%n
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender 
-log4j.appender.R.File=${catalina.home}/logs/tomcat.log 
+log4j.appender.R.File=/var/log/glustermg/glustermg.log 
 log4j.appender.R.MaxFileSize=10MB 
 log4j.appender.R.MaxBackupIndex=10 
 log4j.appender.R.layout=org.apache.log4j.PatternLayout 
 log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
 
-log4j.logger.org.springframework=ERROR
-log4j.logger.org.springframework.aop=DEBUG
-log4j.logger.com.gluster=INFO
\ No newline at end of file
+log4j.logger.org=ERROR
+log4j.logger.com=ERROR
+log4j.logger.com.gluster=DEBUG
\ No newline at end of file