[incubator-ponymail-foal] branch master updated: Eliminate global variables

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new 61572e5  Eliminate global variables
61572e5 is described below

commit 61572e5268b9561717f5dfa0e400559f38f084d0
Author: Sebb <se...@apache.org>
AuthorDate: Fri May 14 16:30:48 2021 +0100

    Eliminate global variables
---
 tools/migrate.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tools/migrate.py b/tools/migrate.py
index 7808d39..fb89644 100644
--- a/tools/migrate.py
+++ b/tools/migrate.py
@@ -13,12 +13,8 @@ import hashlib
 # Increment this number whenever breaking changes happen in the migration workflow:
 MIGRATION_MAGIC_NUMBER = "1"
 
-# ES connections
-old_es = None
-new_es = None
 
-
-async def bulk_push(json):
+async def bulk_push(json, es):
     """Pushes a bunch of objects to ES in a bulk operation"""
     js_arr = []
     for entry in json:
@@ -31,11 +27,10 @@ async def bulk_push(json):
         js_arr.append(
             bulk_op
         )
-    await helpers.async_bulk(new_es, js_arr)
+    await helpers.async_bulk(es, js_arr)
 
 
 async def main():
-    global old_es, new_es
     print("Welcome to the Apache Pony Mail -> Foal migrator.")
     print("This will copy your old database, adjust the structure, and insert the emails into your new foal database.")
     print("------------------------------------")
@@ -137,7 +132,7 @@ async def main():
         })
 
         if len(bulk_array) > 100:
-            await bulk_push(bulk_array)
+            await bulk_push(bulk_array, new_es)
             bulk_array[:] = []
 
         processed += 1
@@ -161,7 +156,7 @@ async def main():
 
     # There may be some docs left over to push
     if bulk_array:
-        await bulk_push(bulk_array)
+        await bulk_push(bulk_array, new_es)
 
     start_time = time.time()
     processed = 0