Commit ae4a3d82 by Szeberényi Imre

Fured fix2

parent f408ecd0
# serializers.py # serializers.py
from kombu.serialization import register from kombu.serialization import register
import pickle import pickle
import logging
logger = logging.getLogger(__name__)
def pickle_v2_dumps(obj): def pickle_v2_dumps(obj):
logger.debug("pickle_v2_dumps CALLED type=%r repr=%r", type(obj), repr(obj))
return pickle.dumps(obj, protocol=2) return pickle.dumps(obj, protocol=2)
def pickle_v2_loads(s): def pickle_v2_loads(s):
logger.debug("pickle_v2_loads CALLED len=%r", len(s))
return pickle.loads(s) return pickle.loads(s)
register( register(
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import libvirt import libvirt
import logging import logging
import os import os
import subprocess
import sys import sys
import socket import socket
import json import json
...@@ -663,16 +664,40 @@ def get_ram_size(): ...@@ -663,16 +664,40 @@ def get_ram_size():
@celery.task @celery.task
def get_driver_version(): def get_driver_version():
from git import Repo
try: try:
repo = Repo(path=os.getcwd()) cwd = os.getcwd()
lc = repo.head.commit branch = subprocess.check_output(
return {'branch': repo.active_branch.name, ["git", "rev-parse", "--abbrev-ref", "HEAD"],
'commit': lc.hexsha, cwd=cwd, text=True
'commit_text': lc.summary, ).strip()
'is_dirty': repo.is_dirty()} commit = subprocess.check_output(
["git", "rev-parse", "HEAD"],
cwd=cwd, text=True
).strip()
commit_text = subprocess.check_output(
["git", "log", "-1", "--pretty=%s"],
cwd=cwd, text=True
).strip()
is_dirty = subprocess.call(
["git", "diff", "--quiet"], cwd=cwd
) != 0
repo_url = subprocess.check_output(
["git", "config", "--get", "remote.origin.url"],
cwd=cwd, text=True
).strip()
path = repo_url.split("://", 1)[-1]
path = path.split("/", 1)[-1]
parts = path.split("/")
return {
"group": parts[0],
"branch": branch,
"commit": commit[:7],
"commit_text": commit_text,
"is_dirty": is_dirty,
}
except Exception as e: except Exception as e:
logger.exception("Unhandled exception: %s", e) logger.exception("Git version check failed: %s", e)
return None return None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment