SomeNet / public repos / pub / jan / aic18.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1060a1f)
prettier error messages
authorDavid Kaufmann <david.kaufmann@student.tuwien.ac.at>
Sun, 25 Nov 2018 15:07:50 +0000 (16:07 +0100)
committerDavid Kaufmann <david.kaufmann@student.tuwien.ac.at>
Sun, 25 Nov 2018 15:07:50 +0000 (16:07 +0100)
camunda-overlay/camunda.py patch | blob | history

diff --git a/camunda-overlay/camunda.py b/camunda-overlay/camunda.py
index e975e22d9bd05b17e80cf5b037a932e814d8fce3..b3c176cce151749cfb4ab0234d9eae9c3f108991 100755 (executable)
--- a/camunda-overlay/camunda.py
+++ b/camunda-overlay/camunda.py
@@ -5,6 +5,7 @@ import os
 import json
 import requests
 import argparse
+from pprint import pprint
 
 CAMUNDA="http://localhost:8080/engine-rest/"
 
@@ -16,11 +17,15 @@ def get_current_deployments(key = 'sentiment-analysis'):
 def cleanup_old_deployments(key='sentiment-analysis'):
     print ("Cleaning up old deployments")
     for deployment in get_current_deployments(key):
-        res = requests.delete(CAMUNDA + "deployment/" + deployment['id'] + "?cascade=true")
+        res = requests.delete(CAMUNDA + "deployment/" + deployment['id'] + "?cascade=true&skipCustomListeners=true")
         if (res.status_code == 204):
             print ("Cleaned up deployment {}".format(deployment['id']))
         else:
             print ("Error cleaning old deployment {}: Code: {}".format(deployment['id'], res.status_code))
+            try:
+                pprint(res.json())
+            except:
+                pprint(res.content)
 
 def create_deployment(cleanup=False):
     parameters = [
@@ -37,14 +42,13 @@ def create_deployment(cleanup=False):
     if (res.status_code == 200):
         print ("Successfully deployed Sentiment Analysis")
     else:
-        from pprint import pprint
         pprint ("Status Code: {}".format(res.status_code))
         try:
             pprint(res.json())
         except:
             pprint(res.content)
 
-def submit_terms(terms=[]):
+def submit_terms(terms):
     termlist = [{'term': term} for term in terms]
     # submit to camunda
     params = {
@@ -62,12 +66,16 @@ def submit_terms(terms=[]):
     if (res.status_code == 200):
         print ("Successfully started Sentiment Analysis")
     else:
-        from pprint import pprint
         pprint ("Status Code: {}".format(res.status_code))
         try:
             pprint(res.json())
         except:
-            pprint(res.content)
+            try:
+                import xml.dom.minidom
+                content = res.content.decode('utf-8').replace('<!doctype html>', '')
+                print(xml.dom.minidom.parseString(content).toprettyxml())
+            except:
+                pprint(res.content)
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()