Revert "[v4 port] Updating Microsoft.Azure.WebJobs to 3.0.33-11924"

This reverts commit 635564a.

Author: alrod

sample/CustomHandlerRetry/HttpTrigger/function.json

@@ -15,10 +15,5 @@
       "direction": "out",
       "name": "res"
     }
-  ],
-  "retry": {
-    "strategy": "fixedDelay",
-    "maxRetryCount": 2,
-    "delayInterval": "00:00:00"
-  }
+  ]
 }

sample/CustomHandlerRetry/TimerTrigger/function.json

@@ -6,5 +6,10 @@
       "defaultExecutablePath": "node",
       "arguments": [ "server.js" ]
     }
+  },
+  "retry": {
+    "strategy": "fixedDelay",
+    "maxRetryCount": 2,
+    "delayInterval": "00:00:00"
   }
 }

sample/CustomHandlerRetry/host.json

@@ -10,45 +10,27 @@ app.use(
 
 app.use(express.json())
 
-var response = {
-    "Outputs": {
-        "res": {
-            "body": "OK"
-        }
-    },
-    "Logs": null,
-    "ReturnValue": null
-}
-
+count = 0;
 app.post('/HttpTrigger', (req, res) => {
-    if (req.body.Metadata.RetryContext) {
+    let retryCount = req.body.Metadata.RetryContext.RetryCount;
+    let maxRetry = req.body.Metadata.RetryContext.MaxRetryCount;
+    var response = {
+        "Outputs": {
+            "res": {
+                "body": "Retry Count:" + retryCount + " Max Retry Count:" + maxRetry
+            }
+        },
+        "Logs": null,
+        "ReturnValue": null
+    }
+    if (retryCount < maxRetry) {
         res.status(500).send(response)
     }
     else {
         res.status(200).send(response)
     }
 })
 
-app.post('/TimerTrigger', (req, res) => {
-    var errorString = 'An error occurred';
-    var maxRetries = 4;
-    var retryContext = req.body.Metadata.RetryContext;
-
-    if (retryContext.MaxRetryCount != maxRetries) {
-        console.log('Unexpected error');
-        throw 'Unexpected error';
-    } else {
-        console.log('JavaScript HTTP trigger function processed a request. retryCount: ' + retryContext.RetryCount);
-
-        if (retryContext.RetryCount < maxRetries) {
-            console.log(errorString);
-            throw errorString;
-        }
-        console.log('Execution completed');
-        res.status(200).send(response)
-    }
-})
-
 app.listen(port, () => {
     console.log(`Example app listening on port ${port}`)
 })

sample/CustomHandlerRetry/server.js

@@ -1,4 +1,4 @@
-{
+{
   "bindings": [
     {
       "type": "httpTrigger",
@@ -18,6 +18,6 @@
   "retry": {
     "strategy": "fixedDelay",
     "maxRetryCount": 4,
-    "delayInterval": "00:00:01"
+    "delayInterval": "00:00:03"
   }
-}
+}

sample/NodeRetry/HttpTrigger-RetryWarning/function.json renamed to sample/NodeRetry/HttpTrigger-RetryFunctionJson/function.json

@@ -1,19 +1,21 @@
 var errorString = 'An error occurred';
 var maxRetries = 4;
 
-module.exports = async function (context, timer) {
+module.exports = async function (context, req) {
     var retryContext = context.executionContext.retryContext;
 
     if (retryContext.maxRetryCount != maxRetries || (retryContext.retryCount > 0 && !retryContext.exception.message.includes(errorString))) {
-        console.log('Unexpected error');
-        throw 'Unexpected error';
+        context.res = {
+            status: 500
+        };
     } else {
         context.log('JavaScript HTTP trigger function processed a request. retryCount: ' + retryContext.retryCount);
 
         if (retryContext.retryCount < maxRetries) {
-            console.log(errorString);
-            throw errorString;
+            throw new Error(errorString);
         }
-        console.log('Execution completed');
+        context.res = {
+            body: 'retryCount: ' + retryContext.retryCount
+        };
     }
 }

sample/NodeRetry/Timer-RetryFunctionJson/index.js renamed to sample/NodeRetry/HttpTrigger-RetryFunctionJson/index.js

@@ -0,0 +1,18 @@
+{
+  "bindings": [
+    {
+      "type": "httpTrigger",
+      "direction": "in",
+      "name": "req",
+      "methods": [
+        "get",
+        "post"
+      ]
+    },
+    {
+      "type": "http",
+      "direction": "out",
+      "name": "res"
+    }
+  ]
+}

sample/NodeRetry/HttpTrigger-RetryHostJson/function.json

@@ -0,0 +1,22 @@
+var errorString = 'An error occurred';
+var maxRetries = 2;
+
+module.exports = async function (context, req) {
+    var retryContext = context.executionContext.retryContext;
+
+    if (retryContext.maxRetryCount != maxRetries || (retryContext.retryCount > 0 && !retryContext.exception.message.includes(errorString))) {
+        debugger;
+        context.res = {
+            status: 500
+        };
+    } else {
+        context.log('JavaScript HTTP trigger function processed a request. retryCount: ' + retryContext.retryCount);
+
+        if (retryContext.retryCount < maxRetries) {
+            throw new Error(errorString);
+        }
+        context.res = {
+            body: 'retryCount: ' + retryContext.retryCount
+        };
+    }
+}