$this->fillConfig($this->config, $result);
- $handler = new MessageHandler($this->config);
+ $log = new Log();
if ($result->options['debug'] || $result->options['debugEdss1']) {
$debugLogger = new Logger_Debug();
- $handler->addLogger($debugLogger, '*');
+ $log->addLogger($debugLogger, '*');
if ($result->options['debugEdss1']) {
$debugLogger->edss1MsgOnly = true;
}
}
+ $callMonitor = new CallMonitor($this->config, $log);
+
+ $handler = new MessageHandler($this->config, $log, $callMonitor);
+
if ($this->config->replayFile !== null) {
$sourceClass = 'callnotifier\Source_File';
} else {
--- /dev/null
+<?php
+namespace callnotifier;
+
+/**
+ * Watches EDSS1 messages for calls. Keeps an internal call state
+ * and notifies loggers of incoming and finished calls.
+ */
+class CallMonitor
+{
+ public function __construct($config, $log)
+ {
+ $this->config = $config;
+ $this->log = $log;
+ }
+
+ public function handle(EDSS1_Message $msg)
+ {
+ }
+
+}
+
+?>
--- /dev/null
+<?php
+namespace callnotifier;
+
+class Log
+{
+ /**
+ * Array of logger object arrays.
+ * Key is the notification type, value is an array of logger objects
+ * that want to get notified about the type.
+ *
+ * @var array
+ */
+ protected $logger = array(
+ 'msgData' => array(),
+ 'edss1msg' => array(),
+ );
+
+ /**
+ * Add a logger
+ *
+ * @param Logger $logger Logger object to register
+ * @param array|string $types Single notification type or array of such
+ * types. "*" means "register for all types".
+ *
+ * @return self
+ */
+ public function addLogger(Logger $logger, $types)
+ {
+ if ($types == '*') {
+ $types = array_keys($this->logger);
+ }
+ $types = (array)$types;
+
+ foreach ($types as $type) {
+ if (!isset($this->logger[$type])) {
+ throw new \Exception('Unknown log type: ' . $type);
+ }
+ $this->logger[$type][] = $logger;
+ }
+ }
+
+ public function log($type, $arData)
+ {
+ if (!isset($this->logger[$type])) {
+ throw new \Exception('Unknown log type: ' . $type);
+ }
+
+ if (count($this->logger[$type])) {
+ foreach ($this->logger[$type] as $logger) {
+ $logger->log($type, $arData);
+ }
+ }
+ }
+
+}
+
+?>
public function __construct()
{
$cc = new \Console_Color2();
- $this->begin = $cc->convert('%y');
- $this->end = $cc->convert('%n');
- $this->blue = $cc->convert('%b');
- $this->red = $cc->convert('%r');
- $this->white = $cc->convert('%w');
+ $this->begin = $cc->convert('%y');
+ $this->end = $cc->convert('%n');
+ $this->blue = $cc->convert('%b');
+ $this->red = $cc->convert('%r');
+ $this->white = $cc->convert('%w');
$this->purple = $cc->convert('%p');
}
{
protected $dumpHdl;
- /**
- * Array of logger object arrays.
- * Key is the notification type, value is an array of logger objects
- * that want to get notified about the type.
- *
- * @var array
- */
- protected $logger = array(
- 'msgData' => array(),
- 'edss1msg' => array(),
- );
-
- public function __construct($config)
+ public function __construct($config, $log, $callMonitor)
{
$this->config = $config;
$this->prepareDump();
- }
-
- /**
- * Add a logger
- *
- * @param Logger $logger Logger object to register
- * @param array|string $types Single notification type or array of such
- * types. "*" means "register for all types".
- *
- * @return self
- */
- public function addLogger(Logger $logger, $types)
- {
- if ($types == '*') {
- $types = array_keys($this->logger);
- }
- $types = (array)$types;
-
- foreach ($types as $type) {
- if (!isset($this->logger[$type])) {
- throw new \Exception('Unknown log type: ' . $type);
- }
- $this->logger[$type][] = $logger;
- }
+ $this->log = $log;
+ $this->callMonitor = $callMonitor;
}
public function handle($msg)
return false;
}
list(, $type, $someid, $details) = $matches;
- $this->log(
+ $this->log->log(
'msgData',
array(
'type' => $type,
);
if ($type == 'Debug') {
- $this->parseEDSS1($details);
+ $msg = $this->parseEDSS1($details);
+ if (is_object($msg)) {
+ $this->log->log('edss1msg', array('msg' => $msg));
+ $this->callMonitor->handle($msg);
+ }
}
}
*
* @param string $details Detail string of a debug message
*
+ * @return EDSS1_Message The retrieved message, NULL if none.
*/
protected function parseEDSS1($details)
{
$bytes = static::getBytesFromHexString($bytestring);
$mp = new EDSS1_Parser();
- $msg = $mp->parse($bytes);
-
- $this->log('edss1msg', array('msg' => $msg));
- }
-
- protected function log($type, $arData)
- {
- if (!isset($this->logger[$type])) {
- throw new \Exception('Unknown log type: ' . $type);
- }
-
- if (count($this->logger[$type])) {
- foreach ($this->logger[$type] as $logger) {
- $logger->log($type, $arData);
- }
- }
+ return $mp->parse($bytes);
}
public static function getBytesFromHexString($bytestring)