mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-02-24 06:52:34 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EmmanuelVella/patch-2'

Browse Source
This commit is contained in:
Jordi Boggiano 2013-07-29 00:00:45 +02:00
commit e3e95f7dd6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Monolog/Handler/PushoverHandler.php
View File

@ -22,7 +22,7 @@ use Monolog\Logger;
class PushoverHandler extends SocketHandler class PushoverHandler extends SocketHandler
{ {
private $token; private $token;
private $user; private $users;
private $title; private $title;
private $highPriorityLevel; private $highPriorityLevel;
@ -30,7 +30,7 @@ class PushoverHandler extends SocketHandler
/** /**
* @param string $token Pushover api token * @param string $token Pushover api token
* @param string $user Pushover user id the message will be sent to * @param string $user Pushover user ids the message will be sent to
* @param string $title Title sent to the Pushover API * @param string $title Title sent to the Pushover API
* @param integer $level The minimum logging level at which this handler will be triggered * @param integer $level The minimum logging level at which this handler will be triggered
* @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
@ -41,13 +41,13 @@ class PushoverHandler extends SocketHandler
* @param integer $emergencyLevel The minimum logging level at which this handler will start * @param integer $emergencyLevel The minimum logging level at which this handler will start
* sending "emergency" requests to the Pushover API * sending "emergency" requests to the Pushover API
*/ */
public function __construct($token, $user, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $highPriorityLevel = Logger::CRITICAL, $emergencyLevel = Logger::EMERGENCY) public function __construct($token, $users, $title = null, $level = Logger::CRITICAL, $bubble = true, $useSSL = true, $highPriorityLevel = Logger::CRITICAL, $emergencyLevel = Logger::EMERGENCY)
{ {
$connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80'; $connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80';
parent::__construct($connectionString, $level, $bubble); parent::__construct($connectionString, $level, $bubble);
$this->token = $token; $this->token = $token;
$this->user = $user; $this->users = (array) $users;
$this->title = $title ?: gethostname(); $this->title = $title ?: gethostname();
$this->highPriorityLevel = $highPriorityLevel; $this->highPriorityLevel = $highPriorityLevel;
$this->emergencyLevel = $emergencyLevel; $this->emergencyLevel = $emergencyLevel;
@ -69,7 +69,7 @@ class PushoverHandler extends SocketHandler
$dataArray = array( $dataArray = array(
'token' => $this->token, 'token' => $this->token,
'user' => $this->user, 'user' => $record['extra']['user'],
'message' => $message, 'message' => $message,
'title' => $this->title, 'title' => $this->title,
'timestamp' => $timestamp 'timestamp' => $timestamp
@ -97,8 +97,12 @@ class PushoverHandler extends SocketHandler
public function write(array $record) public function write(array $record)
{ {
parent::write($record); foreach ($this->users as $user) {
$this->closeSocket(); $record['extra']['user'] = $user;
parent::write($record);
$this->closeSocket();
}
} }
public function setHighPriorityLevel($value) { public function setHighPriorityLevel($value) {