From b1024dd6b80b5a4ad4efa98ff3864729a09c01ba Mon Sep 17 00:00:00 2001
From: Tim <timothyasir@gluster.com>
Date: Tue, 16 Aug 2011 18:56:33 +0530
Subject: Bug 3397 - GUI does not proceed beyond cluster register on AMI.

---
 .../src/backend/get_server_details.py                          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/com.gluster.storage.management.gateway.scripts')

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index 30ffac58..ecbe1237 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -24,6 +24,7 @@ if not p1 in sys.path:
     sys.path.append(p1)
 if not p2 in sys.path:
     sys.path.append(p2)
+import dbus
 import socket
 import re
 import Utils
@@ -100,11 +101,16 @@ def getServerDetails(listall):
     responseDom.appendTag(serverTag)
     serverTag.appendChild(responseDom.createTag("numOfCPUs", int(os.sysconf('SC_NPROCESSORS_ONLN'))))
 
-    diskDom = DiskUtils.getDiskDom()
+    try:
+        diskDom = DiskUtils.getDiskDom()
+    except dbus.dbus_bindings.DBusException, e:
+        sys.stderr.write("Failed to connect HAL to get device details. Please check if HAL services are running\n")
+        Utils.log("Failed to connect HAL to get device details")
+        sys.exit(1)
     if not diskDom:
         sys.stderr.write("No disk found!")
         Utils.log("Failed to get disk details")
-        sys.exit(1)
+        sys.exit(2)
 
     serverTag.appendChild(diskDom.getElementsByTagRoute("disks")[0])
     return serverTag
-- 
cgit