Core: Fixed API running out of connections from pool

helpers/db.py

@@ -17,7 +17,7 @@
 uri = f"{config.DB.type}+{config.DB.driver}://{config.DB.user}:{config.DB.password}@" \
                                  f"{config.DB.host}:{config.DB.port}/{config.DB.db}"
 
-engine = sqlalchemy.create_engine(uri)
+engine = sqlalchemy.create_engine(uri, pool_size=5, max_overflow=-1, pool_timeout=10)
 factory = sessionmaker(bind=engine)
 
 Base = sqlalchemy.ext.declarative.declarative_base()

main.py

@@ -3,6 +3,7 @@
 from globals import app
 from helpers import init
 from routes import user
+from routes.api_comments import api_comment
 from routes.api_create import api_create
 from routes.api_get import api_get
 from routes.api_moderate import api_moderate
@@ -18,6 +19,7 @@
 app.register_blueprint(api_create)
 app.register_blueprint(api_permissions)
 app.register_blueprint(api_moderate)
+app.register_blueprint(api_comment)
 
 @app.after_request
 def add_header(r):

routes/api_comments.py

@@ -6,10 +6,10 @@
 from globals import app
 from helpers import db
 
-api_moderate = Blueprint("api_comment", __name__)
+api_comment = Blueprint("api_comment", __name__)
 
 @crossdomain(origin="*", current_app=app)
-@api_moderate.route("/api/content/comment/")
+@api_comment.route("/api/content/comment/")
 @login_required
 def comment():
     content_id = request.args["id"]
@@ -25,5 +25,7 @@ def comment():
         session.add(db.Content(location=content_id, type="comment", permissions=permissions, content=content))
         session.commit()
         session.close()
+
+        return {"success": True, "message": "success"}
     else:
         return {"error": {"message": "missing permissions"}}, 403

routes/api_create.py

@@ -29,6 +29,6 @@ def create_content():
         session.commit()
         session.close()
 
-        return {"message": "success"}, 201
+        return {"success": True, "message": "success"}, 201
     else:
         return permission, 500

routes/api_get.py

@@ -76,6 +76,8 @@ def breadcrumb():
 
     data.reverse()
 
+    session.close()
+
     return jsonify(data)
 
 @crossdomain(origin="*", current_app=app)
@@ -92,4 +94,6 @@ def versions():
     res = session.query(db.Versions).filter_by(content_id=location).order_by(db.Versions.id)
     res = reversed(res)
 
+    session.close()
+
     return jsonify(res)

routes/api_moderate.py

@@ -29,7 +29,7 @@ def delete_content():
         session.commit()
         session.close()
 
-        return {"message": "success", "redirect": parent_id}, 200
+        return {"success": True, "message": "success", "redirect": parent_id}, 200
 
     else:
         return {"error": {"message": "missing permissions"}}, 403
@@ -47,7 +47,7 @@ def cut_content():
     if helpers.permissions.permission_check(current_user, content_id, "moderate", "move"):
         cut_objects[current_user.email] = content_id
 
-        return {"message": "success", "redirect": content_id}, 200
+        return {"success": True, "message": "success", "redirect": content_id}, 200
 
     else:
         return {"error": {"message": "missing permissions"}}, 403
@@ -78,7 +78,7 @@ def paste_content():
 
         del cut_objects[current_user.email]
 
-        return {"message": "success", "redirect": content_id}, 200
+        return {"success": True, "message": "success", "redirect": content_id}, 200
     else:
         return {"error": {"message": "missing permissions"}}, 403
 
@@ -118,4 +118,4 @@ def edit():
     session.commit()
     session.close()
 
-    return {"message": "success", "redirect": content_id}, 200
+    return {"success": True, "message": "success", "redirect": content_id}, 200

routes/user.py

@@ -78,7 +78,7 @@ def login():
                 db.session.add(user)
                 db.session.commit()
 
-                return {"message": "success", "user": {"username": user.username}}, 200
+                return {"success": True, "message": "success", "user": {"username": user.username}}, 200
             else:
                 return {"error": {"message": "wrong password", "frontend": "WRONG_PASSWORD"}}, 401
 
@@ -97,7 +97,7 @@ def logout():
     db.session.add(user)
     db.session.commit()
     logout_user()
-    return {"message": "success"}, 200
+    return {"success": True, "message": "success"}, 200
 
 
 @user_management.route("/register/", methods=["GET", "POST"])
@@ -121,6 +121,6 @@ def register():
         db.session.add(user)
         db.session.commit()
 
-        return {"message": "success", "user": {"username": user.username}}, 200
+        return {"success": True, "message": "success", "user": {"username": user.username}}, 200
 
     return {"error": {"message": "no form recieved"}}, 400