added update channel to usage report
This commit is contained in:
parent
0ce3c8bae6
commit
ea2e0b0698
@ -19,8 +19,8 @@ class UsageReporter implements TimerListener {
|
||||
/*
|
||||
* Constants
|
||||
*/
|
||||
const UPDATE_MINUTE_COUNT = 10;
|
||||
const SETTING_DISABLE_USAGE_REPORTING = 'Disable Usage Reporting';
|
||||
const UPDATE_MINUTE_COUNT = 10;
|
||||
const SETTING_REPORT_USAGE = 'Report Usage to $lManiaControl.com$l';
|
||||
|
||||
/*
|
||||
* Private Properties
|
||||
@ -34,22 +34,22 @@ class UsageReporter implements TimerListener {
|
||||
*/
|
||||
public function __construct(ManiaControl $maniaControl) {
|
||||
$this->maniaControl = $maniaControl;
|
||||
$this->maniaControl->settingManager->initSetting($this, self::SETTING_DISABLE_USAGE_REPORTING, false);
|
||||
$this->maniaControl->timerManager->registerTimerListening($this, 'reportUsage', 1000 * 60 * self::UPDATE_MINUTE_COUNT);
|
||||
|
||||
$this->maniaControl->settingManager->initSetting($this, self::SETTING_REPORT_USAGE, true);
|
||||
|
||||
$this->maniaControl->timerManager->registerTimerListening($this, 'reportUsage', 1000 * 60 * self::UPDATE_MINUTE_COUNT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reports Usage every xx Minutes
|
||||
* Report Usage every xx Minutes
|
||||
*
|
||||
* @param float $time
|
||||
*/
|
||||
public function reportUsage($time) {
|
||||
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_DISABLE_USAGE_REPORTING)) {
|
||||
if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_REPORT_USAGE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
$properties = array();
|
||||
$properties['ManiaControlVersion'] = ManiaControl::VERSION;
|
||||
$properties['OperatingSystem'] = php_uname();
|
||||
@ -57,17 +57,18 @@ class UsageReporter implements TimerListener {
|
||||
$properties['ServerLogin'] = $this->maniaControl->server->login;
|
||||
$properties['TitleId'] = $this->maniaControl->server->titleId;
|
||||
$properties['ServerName'] = Formatter::stripDirtyCodes($this->maniaControl->client->getServerName());
|
||||
$properties['UpdateChannel'] = $this->maniaControl->updateManager->getCurrentUpdateChannelSetting();
|
||||
|
||||
$properties['PlayerCount'] = $this->maniaControl->playerManager->getPlayerCount();
|
||||
$properties['MemoryUsage'] = memory_get_usage();
|
||||
$properties['MemoryPeakUsage'] = memory_get_peak_usage();
|
||||
|
||||
$maxPlayers = $this->maniaControl->client->getMaxPlayers();
|
||||
$properties['MaxPlayers'] = $maxPlayers["CurrentValue"];
|
||||
$properties['MaxPlayers'] = $maxPlayers['CurrentValue'];
|
||||
|
||||
try {
|
||||
$scriptName = $this->maniaControl->client->getScriptName();
|
||||
$properties['ScriptName'] = $scriptName["CurrentValue"];
|
||||
$properties['ScriptName'] = $scriptName['CurrentValue'];
|
||||
} catch (Exception $e) {
|
||||
if ($e->getMessage() == 'Not in script mode.') {
|
||||
$properties['ScriptName'] = '';
|
||||
@ -93,11 +94,11 @@ class UsageReporter implements TimerListener {
|
||||
$info = base64_encode($json);
|
||||
|
||||
$self = $this;
|
||||
$this->maniaControl->fileReader->loadFile(ManiaControl::URL_WEBSERVICE . "/usagereport?info=" . urlencode($info), function ($response, $error) use (&$self) {
|
||||
$this->maniaControl->fileReader->loadFile(ManiaControl::URL_WEBSERVICE . '/usagereport?info=' . urlencode($info), function ($response, $error) use (&$self) {
|
||||
$response = json_decode($response);
|
||||
if ($error || !$response) {
|
||||
$self->maniaControl->log("Error while Sending data: " . $error);
|
||||
$self->maniaControl->log('Error while Sending data: ' . $error);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user