Log version at start. fix #2708
This commit is contained in:
@@ -32,6 +32,7 @@ class Updater(Plugin):
|
|||||||
else:
|
else:
|
||||||
self.updater = SourceUpdater()
|
self.updater = SourceUpdater()
|
||||||
|
|
||||||
|
addEvent('app.load', self.logVersion, priority = 10000)
|
||||||
addEvent('app.load', self.setCrons)
|
addEvent('app.load', self.setCrons)
|
||||||
addEvent('updater.info', self.info)
|
addEvent('updater.info', self.info)
|
||||||
|
|
||||||
@@ -53,6 +54,10 @@ class Updater(Plugin):
|
|||||||
|
|
||||||
addEvent('setting.save.updater.enabled.after', self.setCrons)
|
addEvent('setting.save.updater.enabled.after', self.setCrons)
|
||||||
|
|
||||||
|
def logVersion(self):
|
||||||
|
info = self.info()
|
||||||
|
log.info('=== VERSION %s, using %s ===', (info.get('version', {}).get('repr', 'UNKNOWN'), self.updater.getName()))
|
||||||
|
|
||||||
def setCrons(self):
|
def setCrons(self):
|
||||||
|
|
||||||
fireEvent('schedule.remove', 'updater.check', single = True)
|
fireEvent('schedule.remove', 'updater.check', single = True)
|
||||||
@@ -204,6 +209,7 @@ class GitUpdater(BaseUpdater):
|
|||||||
output = self.repo.getHead() # Yes, please
|
output = self.repo.getHead() # Yes, please
|
||||||
log.debug('Git version output: %s', output.hash)
|
log.debug('Git version output: %s', output.hash)
|
||||||
self.version = {
|
self.version = {
|
||||||
|
'repr': 'git:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.branch, output.hash[:8], datetime.fromtimestamp(output.getDate())),
|
||||||
'hash': output.hash[:8],
|
'hash': output.hash[:8],
|
||||||
'date': output.getDate(),
|
'date': output.getDate(),
|
||||||
'type': 'git',
|
'type': 'git',
|
||||||
@@ -231,7 +237,7 @@ class GitUpdater(BaseUpdater):
|
|||||||
local = self.repo.getHead()
|
local = self.repo.getHead()
|
||||||
remote = branch.getHead()
|
remote = branch.getHead()
|
||||||
|
|
||||||
log.info('Versions, local:%s, remote:%s', (local.hash[:8], remote.hash[:8]))
|
log.debug('Versions, local:%s, remote:%s', (local.hash[:8], remote.hash[:8]))
|
||||||
|
|
||||||
if local.getDate() < remote.getDate():
|
if local.getDate() < remote.getDate():
|
||||||
self.update_version = {
|
self.update_version = {
|
||||||
@@ -359,6 +365,7 @@ class SourceUpdater(BaseUpdater):
|
|||||||
log.debug('Source version output: %s', output)
|
log.debug('Source version output: %s', output)
|
||||||
self.version = output
|
self.version = output
|
||||||
self.version['type'] = 'source'
|
self.version['type'] = 'source'
|
||||||
|
self.version['repr'] = 'source:(%s:%s % s) %s (%s)' % (self.repo_user, self.repo_name, self.branch, output.get('hash', '')[:8], datetime.fromtimestamp(output.get('date', 0)))
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
log.error('Failed using source updater. %s', e)
|
log.error('Failed using source updater. %s', e)
|
||||||
return {}
|
return {}
|
||||||
@@ -446,6 +453,7 @@ class DesktopUpdater(BaseUpdater):
|
|||||||
|
|
||||||
def getVersion(self):
|
def getVersion(self):
|
||||||
return {
|
return {
|
||||||
|
'repr': 'desktop: %s' % self.desktop._esky.active_version,
|
||||||
'hash': self.desktop._esky.active_version,
|
'hash': self.desktop._esky.active_version,
|
||||||
'date': None,
|
'date': None,
|
||||||
'type': 'desktop',
|
'type': 'desktop',
|
||||||
|
|||||||
Reference in New Issue
Block a user