deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

PHPCI/Plugin/XMPP.php : Add new param «dateFormat» to display date/hour in notification message. Move code to build message string in separate method

Browse source
This commit is contained in:
Alexandre Russo 2014-05-21 11:16:05 +02:00
commit 40b52fb1bd
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
PHPCI/Plugin/XMPP.php
View file

@ -55,6 +55,11 @@ class XMPP implements \PHPCI\Plugin
*/
protected $recipients
/**
* @var string, mask to format date
*/
protected $dateFormat
/**
*
* @param Builder $phpci
@ -72,6 +77,7 @@ class XMPP implements \PHPCI\Plugin
$this->alias = '';
$this->recipients= array();
$this->tls = false;
$this->dateFormat= '%d/%m/%Y %l:%M %P';
/*
* Set recipients list
@ -94,7 +100,8 @@ class XMPP implements \PHPCI\Plugin
*/
protected function setOptions($options)
{
foreach (array('username', 'password', 'alias', 'tls', 'server') as $key) {
foreach (array('username', 'password', 'alias', 'tls', 'server', 'dateFormat')
as $key) {
if (array_key_exists($key, $options)) {
$this->{$key} = $options[$key];
}
@ -174,24 +181,13 @@ class XMPP implements \PHPCI\Plugin
$tls = ' -t';
}
/*
* Build message from status build
*/
if($this->build->isSuccessful()) {
$message = "✔ [".$this->build->getProjectTitle()."] Build #".
$this->build->getId()." successful";
} else {
$message = "✘ [".$this->build->getProjectTitle()."] Build #".
$this->build->getId()." failure";
}
/*
* Send XMPP notification for all recipients
*/
$success = array()
foreach($this->recipients as $recipient) {
if($cmd = $this->phpci->executeCommand('echo %s | ' . $sendxmpp .
' %s %s', $message, $tls, $recipients)) {
' %s %s', $this->getMessage(), $tls, $recipients)) {
$success[] = $cmd;
}
@ -200,4 +196,25 @@ class XMPP implements \PHPCI\Plugin
return (count($success) === count($this->recipients));
}
/**
* Build message for notification
*
* @return string
*/
protected function getMessage()
{
$message = '';
if($this->build->isSuccessful()) {
$message = "✔ [".$this->build->getProjectTitle()."] Build #".
$this->build->getId()." successful";
} else {
$message = "✘ [".$this->build->getProjectTitle()."] Build #".
$this->build->getId()." failure";
}
$message .= ' ('.strftime($this->dateFormat).')';
return $message;
}
}