external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-02-12 21:11:53 +00:00
Code Issues Releases Wiki Activity

add rq scheduler and fix memory perms check

Browse source
This commit is contained in:
Jordan Rodgers 2018-01-24 22:23:49 -05:00
parent d0368e743f
commit 9405d5b6cc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proxstar/__init__.py
View file

@ -3,6 +3,7 @@ import time
import subprocess import subprocess
from rq import Queue from rq import Queue
from redis import Redis from redis import Redis
from rq_scheduler import Scheduler
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from werkzeug.contrib.cache import SimpleCache from werkzeug.contrib.cache import SimpleCache
@ -33,6 +34,7 @@ cache = SimpleCache()
redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT']) redis_conn = Redis(app.config['REDIS_HOST'], app.config['REDIS_PORT'])
q = Queue(connection=redis_conn) q = Queue(connection=redis_conn)
scheduler = Scheduler(connection=redis_conn)
engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI']) engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI'])
Base.metadata.bind = engine Base.metadata.bind = engine
@ -188,8 +190,8 @@ def vm_cpu(vmid, cores):
def vm_mem(vmid, mem): def vm_mem(vmid, mem):
user = session['userinfo']['preferred_username'] user = session['userinfo']['preferred_username']
proxmox = connect_proxmox() proxmox = connect_proxmox()
if int(vmid) in get_user_allowed_vms( if 'rtp' in session['userinfo']['groups'] or int(
proxmox, user) or 'rtp' in session['userinfo']['groups']: vmid) in get_user_allowed_vms(proxmox, user):
cur_mem = get_vm_config(proxmox, vmid)['memory'] // 1024 cur_mem = get_vm_config(proxmox, vmid)['memory'] // 1024
if mem >= cur_mem: if mem >= cur_mem:
status = get_vm(proxmox, vmid)['qmpstatus'] status = get_vm(proxmox, vmid)['qmpstatus']