summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java2
-rw-r--r--src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java2
-rw-r--r--src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py7
3 files changed, 9 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
index e382b10a..577cf733 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
@@ -77,7 +77,7 @@ public class GlusterPreferencePage
addField(new ComboFieldEditor(PreferenceConstants.P_DEFAULT_CLUSTER_NAME, "Default &Cluster to manage:",
clusterNamesArr, getFieldEditorParent()));
- addField(new IntegerFieldEditor(PreferenceConstants.P_DATA_SYNC_INTERVAL, "&Data Sync Interval (sec):",
+ addField(new IntegerFieldEditor(PreferenceConstants.P_DATA_SYNC_INTERVAL, "&Refresh Interval (sec):",
getFieldEditorParent()));
}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
index 08092e7e..11b0e6a6 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
@@ -219,6 +219,8 @@ public class Device extends Entity {
setMountPoint(newDevice.getMountPoint());
setServerName(newDevice.getServerName());
setStatus(newDevice.getStatus());
+ setFsType(newDevice.getFsType());
+ setType(newDevice.getType());
setSpace(newDevice.getSpace());
setSpaceInUse(newDevice.getSpaceInUse());
}
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
index a090eb42..14988c4d 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
@@ -46,7 +46,7 @@ LOG_SYSLOG = 1
SYSLOG_REQUIRED = False
LOG_FILE_NAME = None
LOG_FILE_OBJ = None
-
+logOpened = False
def _getLogCode(priority):
if syslog.LOG_EMERG == priority:
@@ -1043,6 +1043,11 @@ def configureDhcpServer(serverIpAddress, dhcpIpAddress):
return configureDnsmasq(serverIpAddress, dhcpIpAddress)
def log(priority, message=None):
+ global logOpened
+ if not logOpened:
+ syslog.openlog(os.path.basename(sys.argv[0]))
+ logOpened = True
+
if type(priority) == type(""):
logPriority = syslog.LOG_INFO
logMessage = priority