refactore request function

slub · Dec 19, 2023 · 5eaaa4b · 5eaaa4b
1 parent 4cfb4c8
commit 5eaaa4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ocrd_lib.sh b/ocrd_lib.sh
@@ -277,8 +277,7 @@ webhook_send() {
   esac
 
   if test -n "$WEBHOOK_RECEIVER_URL" -a -n "$WEBHOOK_KEY_DATA" -a -n "$EVENT"; then
-    echo "{ \"key-data\": \"$WEBHOOK_KEY_DATA\", \"event\": \"$EVENT\", \"message\": \"$MESSAGE\" }" | curl -k -X POST -H "Content-Type: application/json" -d @- $WEBHOOK_RECEIVER_URL
-
+    webhook_request "$WEBHOOK_RECEIVER_URL" "$WEBHOOK_KEY_DATA" "$EVENT" "$MESSAGE"
     if ((JOBCOMPLETE)); then
         logret # communicate retval 0
     fi
@@ -287,6 +286,10 @@ webhook_send() {
   fi
 }
 
+webhook_request() {
+  echo "{ \"key-data\": \"${2}\", \"event\": \"${3}\", \"message\": \"${4}\" }" | curl -k -X POST -H "Content-Type: application/json" -d @- ${1}
+}
+
 webhook_send_info() {
   if test -n "${1}"; then
     webhook_send 1 "${1}"

diff --git a/tests/ocrd_lib_webhook_test.py b/tests/ocrd_lib_webhook_test.py
@@ -47,4 +47,3 @@ def validateJSON(jsonStr: str) -> Any:
         return json.loads(jsonStr)
     except ValueError:
         assert False, f"The json set to the receiver is not valid."
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,4 +47,3 @@ def validateJSON(jsonStr: str) -> Any:
		return json.loads(jsonStr)
		except ValueError:
		assert False, f"The json set to the receiver is not valid."