Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/cm/lib/task_scheduler.py
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/cm/lib/task_scheduler.py	(revision 2841)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/cm/lib/task_scheduler.py	(working copy)
@@ -14,6 +14,7 @@
 import requests
 import re
 from apscheduler.schedulers.background import BackgroundScheduler
+from apscheduler.events import EVENT_JOB_ERROR
 from multiprocessing.pool import ThreadPool
 from cm.lib.libbasic_operation import oper_log, send_cli_to_device, send_xmlrpc_to_device, get_rest_info_from_device, get_device_type, get_ip_address
 from cm.lib.postgres_db import DB
Index: /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py
===================================================================
--- /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py	(revision 2841)
+++ /branches/amp_3_7_2/src/webui/webui/htdocs/new/src/hive/controller/snapshot_controller.py	(working copy)
@@ -35,11 +35,11 @@
             elif path == "export/status":
                 return get_export_status()
 
-        return json_response({"error": 400, "message": "Invalid HTTP method or path"}, 400)
+        return json_response({"status": "Failed", "error": 400, "message": "Invalid HTTP method or path"}, 400)
 
     except Exception as e:
         oper_log("error", "system", "Snapshot handler exception: {}".format(str(e)))
-        return json_response({"error": 500, "message": "Internal Snapshot Controller Error"}, 500)
+        return json_response({"status": "Failed", "error": 500, "message": "Internal Snapshot Controller Error"}, 500)
 
 
 # ============================================================
@@ -49,21 +49,21 @@
     try:
 
         if request.method != "POST":
-            return json_response({"error": "POST required"}, 405)
+            return json_response({"status": "Failed", "message": "POST required"}, 405)
 
         try:
             body = json.loads(request.body) if request.body else {}
         except:
-            return json_response({"error": "Invalid JSON"}, 400)
+            return json_response({"status": "Failed", "message": "Invalid JSON"}, 400)
 
         if body.get("ip"):
             # username + password required
             if not body.get("username") or not body.get("password"):
-                return json_response({"error": "username and password are required when ip is provided"}, status=400)
+                return json_response({"status": "Failed", "message": "username and password are required when ip is provided"}, status=400)
 
             if body.get("location") == 'custom':
                 if body.get("path") is None:
-                    return json_response({"error": "Export path must be specified"}, status=400)
+                    return json_response({"status": "Failed", "message": "Export path must be specified"}, status=400)
 
         result = SnapshotService.run_export(
             location=body.get("location", "primary"),
@@ -76,18 +76,19 @@
         error_msg = result.get("error", "")
 
         if result.get("return_code") == 0:
-            return json_response({"message": "Snapshot export completed successfully"})
+            return json_response({"status": "Successful", "message": "Snapshot export completed successfully"})
         elif result.get("return_code") == 1:
             oper_log("error", "system", "Error exporting snapshot: {}".format(str(error_msg)))
-            return json_response({"message": "Error exporting snapshot",
+            return json_response({"status": "Failed",
+                                  "message": "Error exporting snapshot",
                                   "details": "{}".format(str(error_msg))})
         else:
             oper_log("error", "system", "Error exporting snapshot: {}".format(str(result)))
-            return json_response({"error": "Error exporting snapshot"}, 500)
+            return json_response({"status": "Failed", "message": "Error exporting snapshot"}, 500)
 
     except Exception as e:
         oper_log("error", "system", "Error Exporting Snapshot: {}".format(str(e)))
-        return json_response({"error": 500, "message": "Error Exporting Snapshot:"}, 500)
+        return json_response({"status": "Failed", "message": "Error Exporting Snapshot:"}, 500)
 
 
 # ============================================================
@@ -99,25 +100,25 @@
         try:
             body = json.loads(request.body)
         except:
-            return json_response({"error": "Invalid JSON"}, 400)
+            return json_response({"status": "Failed", "message": "Invalid JSON"}, 400)
 
         required = ["location", "ip", "username", "password"]
 
         # Validate fields
         for field in required:
             if field not in body or not body[field]:
-                return json_response({"error": "Missing field: %s" % field}, status=400)
+                return json_response({"status": "Failed", "message": "Missing field: %s" % field}, status=400)
 
         if body.get("location") == 'custom':
             if body.get("path") is None:
-                return json_response({"error": "Import path must be specified"}, status=400)
+                return json_response({"status": "Failed", "message": "Import path must be specified"}, status=400)
 
         start_date = body.get("start_date")
         end_date = body.get("end_date")
 
         # DATE RULES
         if end_date and not start_date:
-            return json_response({"error": "End date requires start date"}, 400)
+            return json_response({"status": "Failed", "message": "End date requires start date"}, 400)
 
         if start_date and not end_date:
             end_date = datetime.datetime.now().strftime("%Y-%m-%d")
@@ -134,18 +135,19 @@
         error_msg = result.get("error", "")
 
         if result.get("return_code") == 0:
-            return json_response({"message": "Snapshot import completed successfully"})
+            return json_response({"status": "Successful", "message": "Snapshot import completed successfully"})
         elif result.get("return_code") == 1:
             oper_log("error", "system", "Error importing snapshot: {}".format(str(error_msg)))
-            return json_response({"message": "Error exporting snapshot",
-                                  "details": {}.format(error_msg)})
+            return json_response({"status": "Failed",
+                                  "message": "Error importing snapshot",
+                                  "details": "{}".format(error_msg)})
         else:
             oper_log("error", "system", "Error importing snapshot: {}".format(str(result)))
-            return json_response({"error": "Error importing snapshot"}, 500)
+            return json_response({"status": "Failed", "message": "Error importing snapshot"}, 500)
 
     except Exception as e:
         oper_log("error", "system", "Error Importing Snapshot: {}".format(str(e)))
-        return json_response({"error": 500, "message": "Error Importing Snapshot:"}, 500)
+        return json_response({"status": "Failed", "error": 500, "message": "Error Importing Snapshot:"}, 500)
 
 
 # ============================================================
@@ -188,7 +190,7 @@
 
     except Exception as e:
         oper_log("error", "system", "Import status exception: {}".format(str(e)))
-        return json_response({"error": "Error fetching import status"}, 500)
+        return json_response({"status": "Failed", "message": "Error fetching import status"}, 500)
 
 
 def get_export_status():
@@ -227,7 +229,7 @@
 
     except Exception as e:
         oper_log("error", "system", "Export status exception: {}".format(str(e)))
-        return json_response({"error": "Error fetching export status"}, 500)
+        return json_response({"status": "Failed", "message": "Error fetching export status"}, 500)
 
 
 def extract_timestamp(line):
