tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dp_changelogs: Neustart verbessert

develop
Ahmed Aly 2017-11-24 11:14:06 +01:00
parent 475c570519
commit 1d4d2cfb25
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ext/custom-addons/dp_changelogs/models/dp_changelog.py
View File

@ -3,6 +3,7 @@
from subprocess import check_output from subprocess import check_output
import pytz import pytz
import os import os
import multiprocessing
from odoo import models, fields, api, tools from odoo import models, fields, api, tools
@ -47,14 +48,19 @@ class ChangeLog(models.Model):
com2 = commit.decode("utf-8") com2 = commit.decode("utf-8")
com2 = com2.split(' ')[0] com2 = com2.split(' ')[0]
new_logs = b'' new_logs = b''
news = False
vals = {}
if last_commit: if last_commit:
com1 = last_commit.commit com1 = last_commit.commit
changelogs = check_output(["git", "log", "--pretty=oneline", com1 + "..." + com2]) changelogs = check_output(["git", "log", "--pretty=oneline", com1 + "..." + com2])
for changelog in changelogs.splitlines(): for changelog in changelogs.splitlines():
new_logs += b' '.join(changelog.split(b' ')[1:]) + b'\n' new_logs += b' '.join(changelog.split(b' ')[1:]) + b'\n'
if new_logs == b'': if not new_logs == b'':
vals = {} news = True
else: else:
news = True
if news:
vals = { vals = {
'commit': com2, 'commit': com2,
'changelogs': new_logs, 'changelogs': new_logs,
@ -65,12 +71,23 @@ class ChangeLog(models.Model):
@api.model @api.model
def _get_reboot_vals(self): def _get_reboot_vals(self):
last_commit = self.search([], limit=1) last_commit = self.search([], limit=1)
if last_commit and last_commit.ppid != str(os.getppid()): workers = 1
vals = { vals = {}
'commit': last_commit.commit, if tools.config.get('workers', False):
'changelogs': 'Reboot', workers = tools.config.get('workers', False)
'ppid': str(os.getppid()) if last_commit:
} if workers > 1 and last_commit.ppid != str(os.getppid()):
vals = {
'commit': last_commit.commit,
'changelogs': 'Reboot',
'ppid': str(os.getppid())
}
if last_commit.ppid != str(os.getpid()):
vals = {
'commit': last_commit.commit,
'changelogs': 'Reboot',
'ppid': str(os.getpid())
}
return vals return vals
@api.model_cr @api.model_cr