comms: debug bstein room cleanup
This commit is contained in:
parent
b6c955e7da
commit
4e701c6340
@ -2,7 +2,7 @@
|
|||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: bstein-force-leave-4
|
name: bstein-force-leave-5
|
||||||
namespace: comms
|
namespace: comms
|
||||||
spec:
|
spec:
|
||||||
backoffLimit: 0
|
backoffLimit: 0
|
||||||
@ -135,25 +135,37 @@ spec:
|
|||||||
conn = db_connect()
|
conn = db_connect()
|
||||||
conn.autocommit = False
|
conn.autocommit = False
|
||||||
try:
|
try:
|
||||||
token = login(SEEDER_USER, SEEDER_PASS)
|
try:
|
||||||
seeder_user_id = whoami(token)
|
token = login(SEEDER_USER, SEEDER_PASS)
|
||||||
results["seeder_user_id"] = seeder_user_id
|
results["seeder_login"] = "ok"
|
||||||
|
except Exception as e:
|
||||||
|
results["seeder_login"] = "error"
|
||||||
|
results["seeder_login_error"] = str(e)
|
||||||
|
print(json.dumps(results, indent=2, sort_keys=True))
|
||||||
|
raise
|
||||||
|
|
||||||
try:
|
try:
|
||||||
seeder_admin = db_get_admin(conn, seeder_user_id)
|
seeder_user_id = whoami(token)
|
||||||
|
results["seeder_user_id"] = seeder_user_id
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
seeder_admin = None
|
results["seeder_user_id_error"] = str(e)
|
||||||
results["seeder_admin_db_error"] = str(e)
|
seeder_user_id = None
|
||||||
results["seeder_admin_db"] = seeder_admin
|
|
||||||
|
|
||||||
# If the seeder user isn't marked admin in Synapse DB, promote it.
|
if seeder_user_id:
|
||||||
# This is safe and reversible, and required for Synapse admin APIs.
|
try:
|
||||||
if seeder_admin == 0:
|
results["seeder_admin_db"] = db_get_admin(conn, seeder_user_id)
|
||||||
db_set_admin(conn, seeder_user_id, True)
|
except Exception as e:
|
||||||
conn.commit()
|
results["seeder_admin_db_error"] = str(e)
|
||||||
results["seeder_admin_db_promoted"] = True
|
|
||||||
else:
|
if results.get("seeder_admin_db") == 0:
|
||||||
results["seeder_admin_db_promoted"] = False
|
try:
|
||||||
|
db_set_admin(conn, seeder_user_id, True)
|
||||||
|
conn.commit()
|
||||||
|
results["seeder_admin_db_promoted"] = True
|
||||||
|
except Exception as e:
|
||||||
|
results["seeder_admin_db_promote_error"] = str(e)
|
||||||
|
else:
|
||||||
|
results["seeder_admin_db_promoted"] = False
|
||||||
|
|
||||||
for room_id in TARGET_ROOMS:
|
for room_id in TARGET_ROOMS:
|
||||||
room_res = {}
|
room_res = {}
|
||||||
@ -165,8 +177,10 @@ spec:
|
|||||||
room_res["deleted"] = False
|
room_res["deleted"] = False
|
||||||
room_res["delete_error"] = str(e)
|
room_res["delete_error"] = str(e)
|
||||||
|
|
||||||
# Verify the user is no longer joined to the rooms (best effort).
|
try:
|
||||||
results["target_joined_rooms_after"] = admin_joined_rooms(token, TARGET_USER_ID)
|
results["target_joined_rooms_after"] = admin_joined_rooms(token, TARGET_USER_ID)
|
||||||
|
except Exception as e:
|
||||||
|
results["target_joined_rooms_after_error"] = str(e)
|
||||||
|
|
||||||
print(json.dumps(results, indent=2, sort_keys=True))
|
print(json.dumps(results, indent=2, sort_keys=True))
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user