Skip to content

CIRCLE / vmdriver

Go to a project

A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/

Commit 456da2c9 by Czémán Arnold
Options

Merge branch 'master' into ceph

parents 258adab7 1562b83b
Showing with 10 additions and 8 deletions
miscellaneous/netcelery@.service
...@@ -11,4 +11,5 @@ TimeoutStopSec=600 ...@@ -11,4 +11,5 @@ TimeoutStopSec=600
Restart=always Restart=always
WorkingDirectory=/home/cloud/vmdriver WorkingDirectory=/home/cloud/vmdriver
ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n %H.%I"
ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A netcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
miscellaneous/vmcelery@.service
...@@ -11,4 +11,5 @@ TimeoutStopSec=600 ...@@ -11,4 +11,5 @@ TimeoutStopSec=600
Restart=always Restart=always
WorkingDirectory=/home/cloud/vmdriver WorkingDirectory=/home/cloud/vmdriver
ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n %H.%I"
ExecStart=/bin/bash -c "source /etc/profile; workon vmdriver; exec celery -A vmcelery worker --loglevel=info -n $(/bin/hostname -s).%I"
vmdriver.py
...@@ -650,13 +650,13 @@ def get_driver_version(): ...@@ -650,13 +650,13 @@ def get_driver_version():
from git import Repo from git import Repo
try: try:
repo = Repo(path=os.getcwd()) repo = Repo(path=os.getcwd())
lc = repo.log()[0] lc = repo.head.commit
return {'branch': repo.active_branch, return {'branch': repo.active_branch.name,
'commit': lc.id_abbrev, 'commit': lc.hexsha,
'commit_text': lc.summary, 'commit_text': lc.summary,
'is_dirty': repo.is_dirty} 'is_dirty': repo.is_dirty()}
except: except Exception as e:
logging.exception("Unhandled exception: ") logging.exception("Unhandled exception: %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