fix: refactor writing to request body

wbstack · Oct 30, 2023 · dbab393 · dbab393
1 parent 5b34f9e
commit dbab393
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 50 deletions.
diff --git a/.github/workflows/docker.test.yml b/.github/workflows/docker.test.yml
@@ -28,6 +28,7 @@ jobs:
           retry_wait_seconds: 2
           warning_on_retry: false
           command: |
+            docker-compose ${{ env.COMPOSE_ARGS }} logs api
             docker-compose ${{ env.COMPOSE_ARGS }} logs wdqs-updater
             line_count=$(docker-compose ${{ env.COMPOSE_ARGS }} logs wdqs-updater | grep "org.wikidata.query.rdf.tool.Updater - Polled" | wc -l)
             echo "line count: $line_count"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,8 @@ services:
       default:
         aliases:
           - api.svc
+    depends_on:
+      - wikibase
     environment:
       - API_WIKIBASE_DOMAIN=localhost
       - API_WDQS_BACKEND=localhost:9999
@@ -76,6 +78,7 @@ services:
       default:
         aliases:
           - mysql.svc
+
 volumes:
   query-service-data:
   mediawiki-mysql-data:
diff --git a/seeder/server.js b/seeder/server.js
@@ -1,47 +1,56 @@
 var http = require('http');
 const wbEdit = require('wikibase-edit')(require('./wikibase-edit.config'));
 
-http.createServer(async function (req, res) {
-    switch (req.url) {
-    case '/getBatches':
-        numEntities = 20;
-        entities = [];
+http.createServer(function (req, res) {
+    console.log('Routing request for %s', req.url);
+    (async () => {
+        switch (req.url) {
+        case '/getBatches':
+            numEntities = 20;
+            entities = [];
 
-        for (var i=1; i <= numEntities; ++i) {
-            const { entity } = await wbEdit.entity.create({
-                type: 'item',
-                labels: {
-                    'en': new Date().toISOString()
-                },
-                descriptions: {
-                    'en': new Date().toDateString() + new Date().toISOString()
-                }
-            });
+            for (var i = 1; i <= numEntities; ++i) {
+                const { entity } = await wbEdit.entity.create({
+                    type: 'item',
+                    labels: {
+                        'en': new Date().toISOString()
+                    },
+                    descriptions: {
+                        'en': new Date().toDateString() + new Date().toISOString()
+                    }
+                });
 
-            console.log('created item id', entity.id)
-            entities.push(entity.id)
-        }
+                console.log('created item id', entity.id)
+                entities.push(entity.id)
+            }
 
-        console.log(new Date().toISOString());
+            console.log(new Date().toISOString());
 
-        responseObject = {
-            'entityIds': entities.join(','),
-            'wiki': {
-                'domain': process.env.API_WIKIBASE_DOMAIN,
-                'wiki_queryservice_namespace': {
-                    'backend': process.env.API_WDQS_BACKEND,
-                    'namespace': 'wdq'
-                }
-            },
+            responseObject = {
+                'entityIds': entities.join(','),
+                'wiki': {
+                    'domain': process.env.API_WIKIBASE_DOMAIN,
+                    'wiki_queryservice_namespace': {
+                        'backend': process.env.API_WDQS_BACKEND,
+                        'namespace': 'wdq'
+                    }
+                },
 
-        };
-        res.end(JSON.stringify([responseObject]));
-    case '/markFailed':
-    case '/markDone':
-        res.writeHead(200);
-        res.end('1');
-    default:
-        res.writeHead(404);
-        res.end('Not found');
-    }
+            };
+            console.log('handled getBatches');
+            res.end(JSON.stringify([responseObject]));
+        case '/markFailed':
+        case '/markDone':
+            console.log('handled mark');
+            res.writeHead(200);
+            res.end('1');
+        default:
+            res.writeHead(404);
+            res.end('Not found');
+        }
+    })()
+        .catch((err) => {
+            res.writeHead(500);
+            res.end(err.toString());
+        })
 }).listen(3030);
diff --git a/src/main/java/org/wikidata/query/rdf/tool/WbStackUpdate.java b/src/main/java/org/wikidata/query/rdf/tool/WbStackUpdate.java
@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
 import java.net.HttpURLConnection;
@@ -202,29 +201,31 @@ private static JsonArray getBatchesFromApi() throws IOException {
     }
 
     private static void updateRemoteBatchStatus(int batchId, boolean success) throws IOException {
+        JsonObject body = new JsonObject();
+        JsonArray batches = new JsonArray();
+        batches.add(batchId);
+        body.add("batches", batches);
+
         URL obj = new URL(success ? wbStackApiEndpointMarkDone : wbStackApiEndpointMarkFailed);
         HttpURLConnection con = (HttpURLConnection) obj.openConnection();
         con.setRequestMethod("POST");
         con.setRequestProperty("User-Agent", USER_AGENT);
+        con.setRequestProperty("Content-Type", "application/json");
         con.setDoOutput(true);
 
-        JsonObject body = new JsonObject();
-        JsonArray batches = new JsonArray();
-        batches.add(batchId);
-        body.add("batches", batches);
-
-        OutputStream os = con.getOutputStream();
-        OutputStreamWriter osw = new OutputStreamWriter(os, "UTF-8");
-        osw.write(body.toString());
-        osw.flush();
-        osw.close();
-        os.close();
         con.connect();
+        try (OutputStream os = con.getOutputStream()) {
+            byte[] input = body.toString().getBytes("utf-8");
+            os.write(input, 0, input.length);
+        } catch (Exception ex) {
+            throw new IOException("Failed writing to request body: " + ex.toString());
+        }
 
         int responseCode = con.getResponseCode();
         if (responseCode != 200) {
             throw new IOException("Got non 200 response code from API: " + responseCode);
         }
+        con.disconnect();
     }
 
     private static void updateBatch(JsonElement batchElement) {