external/HyperProxmox
1
0
Fork 0
mirror of https://github.com/ThomasGsp/HyperProxmox.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Fix errors

Browse source
This commit is contained in:
Tlams 2018-02-13 16:44:46 +00:00
parent 4c9364c073
commit 054cfceb72
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
code/scripts/main/core/modules/mod_database.py
View file

@ -4,7 +4,6 @@ import json
import redis import redis
import time import time
class Redis_wrapper: class Redis_wrapper:
def __init__(self, server="127.0.0.1", port=6379, db=0, password=None): def __init__(self, server="127.0.0.1", port=6379, db=0, password=None):
# DB = # DB =
@ -21,7 +20,7 @@ class Redis_wrapper:
def connect(self): def connect(self):
try: try:
conn = self.r = redis.Redis( conn = self.r = redis.StrictRedis(
host=self.server, port=self.port, db=self.db, password=self.password, host=self.server, port=self.port, db=self.db, password=self.password,
charset="utf-8", decode_responses=True) charset="utf-8", decode_responses=True)
self.r.client_list() self.r.client_list()
@ -40,10 +39,7 @@ class Redis_wrapper:
def get_message(self, key): def get_message(self, key):
try: try:
result = { result = json.loads(dumps(self.r.get(key)))
"result": "OK",
"value": self.r.get(key)
}
except BaseException as e: except BaseException as e:
result = { result = {
"result": "ERROR", "result": "ERROR",
@ -429,8 +425,8 @@ class MongoDB:
result = { result = {
"result": "OK", "result": "OK",
"value": json.loads(dumps( "value": json.loads(dumps(
self.db[self.collection_disks].find_one( self.db[self.collection_disks].find(
{'$and': [{"date": int(date), "cluster": cluster, "node": node, "vmid": int(vmid)}]}))) {'$and': [{"date": int(date), "cluster": cluster, "node": node, "vmid": str(vmid)}]})))
} }
except BaseException as serr: except BaseException as serr: