Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 13:56:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: webhooks;

Browse Source
This commit is contained in:
Usman Nasir
2020-03-30 17:44:35 +05:00
parent e7ee66177f
commit 92c00ebf50
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
websiteFunctions/website.py
View File

@@ -4072,6 +4072,7 @@ StrictHostKeyChecking no
try: try:
web = Websites.objects.get(domain=self.domain) web = Websites.objects.get(domain=self.domain)
self.web = web
externalApp = web.externalApp externalApp = web.externalApp
self.folder = '/home/%s/public_html' % (domain) self.folder = '/home/%s/public_html' % (domain)
self.masterDomain = domain self.masterDomain = domain
@@ -4080,15 +4081,16 @@ StrictHostKeyChecking no
externalApp = web.master.externalApp externalApp = web.master.externalApp
self.folder = web.path self.folder = web.path
self.masterDomain = web.master.domain self.masterDomain = web.master.domain
self.web = web.master
## Check if remote exists ## Check if remote exists
command = 'git -C %s pull' % (self.folder) command = 'git -C %s pull' % (self.folder)
commandStatus = ProcessUtilities.outputExecutioner(command , externalApp) commandStatus = ProcessUtilities.outputExecutioner(command)
if commandStatus.find('Already up to date') == -1: if commandStatus.find('Already up to date') == -1:
message = '[Webhook Fired] Status: %s.' % (commandStatus) message = '[Webhook Fired] Status: %s.' % (commandStatus)
GitLogs(owner=web, type='INFO', message=message).save() GitLogs(owner=self.web, type='INFO', message=message).save()
### Fetch git configurations ### Fetch git configurations
@@ -4118,27 +4120,27 @@ StrictHostKeyChecking no
if gitConf['webhookCommand']: if gitConf['webhookCommand']:
if gitConf['commands'] != 'NONE': if gitConf['commands'] != 'NONE':
GitLogs(owner=web, type='INFO', message='Running commands after successful git commit..').save() GitLogs(owner=self.web, type='INFO', message='Running commands after successful git commit..').save()
if gitConf['commands'].find(',') > -1: if gitConf['commands'].find(',') > -1:
commands = gitConf['commands'].split(',') commands = gitConf['commands'].split(',')
for command in commands: for command in commands:
GitLogs(owner=web, type='INFO', GitLogs(owner=self.web, type='INFO',
message='Running: %s' % (command)).save() message='Running: %s' % (command)).save()
result = ProcessUtilities.outputExecutioner(command, web.externalApp) result = ProcessUtilities.outputExecutioner(command, self.web.externalApp)
GitLogs(owner=web, type='INFO', GitLogs(owner=self.web, type='INFO',
message='Result: %s' % (result)).save() message='Result: %s' % (result)).save()
else: else:
GitLogs(owner=web, type='INFO', GitLogs(owner=self.web, type='INFO',
message='Running: %s' % (gitConf['commands'])).save() message='Running: %s' % (gitConf['commands'])).save()
result = ProcessUtilities.outputExecutioner(gitConf['commands'], web.externalApp) result = ProcessUtilities.outputExecutioner(gitConf['commands'], self.web.externalApp)
GitLogs(owner=web, type='INFO', GitLogs(owner=self.web, type='INFO',
message='Result: %s' % (result)).save() message='Result: %s' % (result)).save()
GitLogs(owner=web, type='INFO', GitLogs(owner=self.web, type='INFO',
message='Finished running commands.').save() message='Finished running commands.').save()
except: except:
pass pass
@@ -4148,7 +4150,7 @@ StrictHostKeyChecking no
return HttpResponse(json_data) return HttpResponse(json_data)
else: else:
message = '[Webhook Fired] Status: %s.' % (commandStatus) message = '[Webhook Fired] Status: %s.' % (commandStatus)
GitLogs(owner=web, type='ERROR', message=message).save() GitLogs(owner=self.web, type='ERROR', message=message).save()
data_ret = {'status': 0, 'error_message': 'Pull not required.', 'commandStatus': commandStatus} data_ret = {'status': 0, 'error_message': 'Pull not required.', 'commandStatus': commandStatus}
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)