Skip to content

Commit

Permalink
fixbug
Browse files Browse the repository at this point in the history
when receive a event like Issue events or Merge request events
can’t read lastCommit will lead to a crash
  • Loading branch information
luicfer committed Oct 23, 2014
1 parent 2a2e79f commit f22eaef
Showing 1 changed file with 23 additions and 13 deletions.
36 changes: 23 additions & 13 deletions gitlabhook.js
Expand Up @@ -103,18 +103,25 @@ function executeShellCmds(self, address, data) {
var a = data.repository.url.split(/[@:]/);
var httpUrl = 'http://' + a[1] + ((a[3]) ? ':' + a[2] : '') +
'/' + a[a.length-1];
var lastCommit = data.commits[data.commits.length-1];
var map = {
'%r': repo,
'%g': data.repository.url,
'%h': httpUrl,
'%u': data.user_name,
'%b': data.ref,
'%i': lastCommit.id,
'%t': lastCommit.timestamp,
'%m': lastCommit.message,
'%s': address
};
if(data.commits.length == 0)
{
var map = false;
}
else
{
var lastCommit = data.commits[data.commits.length-1];
var map = {
'%r': repo,
'%g': data.repository.url,
'%h': httpUrl,
'%u': data.user_name,
'%b': data.ref,
'%i': lastCommit.id,
'%t': lastCommit.timestamp,
'%m': lastCommit.message,
'%s': address
};
}

function execute(path, idx) {
if (idx == cmds.length) {
Expand Down Expand Up @@ -235,7 +242,10 @@ function getCmds(tasks, map, repo) {
if (tasks.hasOwnProperty(repo)) x.push(tasks[repo]);
for (var i=0; i<x.length; i++) {
var cmdStr = (isArray(x[i])) ? x[i].join('\n') : x[i];
for (var j in map) cmdStr = cmdStr.replace(new RegExp(j, 'g'), map[j]);
if(map != false)
{
for (var j in map) cmdStr = cmdStr.replace(new RegExp(j, 'g'), map[j]);
}
ret.push(cmdStr + '\n');
}
return ret;
Expand Down

0 comments on commit f22eaef

Please sign in to comment.