diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-08-22 19:10:55 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-08-22 19:10:55 +0530 |
| commit | 7b12c934d0ff76ff679bcc98ac67b01956a76cc7 (patch) | |
| tree | 1fba91213f9fd6399f36fb5446c765ffc768b66b | |
| parent | 388a672531de173d47bb97df38c93542c4c31f16 (diff) | |
| parent | d5ad62c32742a2585c23f03aa8e3d5461886cfac (diff) | |
Merge branch 'master' of github.com:gluster/console
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 |