Skip to content

Commit 94818bb

Browse files
detaindetain
committed
lots of updates to myadmin_log calls adding the optional module and service id parameters in applicable places
1 parent f954fda commit 94818bb

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

‎src/Plugin.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public static function getHooks()
5151
public static function getActivate(GenericEvent $event)
5252
{
5353
if ($event['category'] == get_service_define('WEB_PLESK')) {
54-
myadmin_log(self::$module, 'info', 'Plesk Activation', __LINE__, __FILE__);
5554
$serviceClass = $event->getSubject();
55+
myadmin_log(self::$module, 'info', 'Plesk Activation', __LINE__, __FILE__, self::$module, $serviceClass->getId());
5656
$settings = get_module_settings(self::$module);
5757
$serverdata = get_service_master($serviceClass->getServer(), self::$module);
5858
$ip = $serverdata[$settings['PREFIX'].'_ip'];
@@ -88,7 +88,7 @@ function_requirements('get_webhosting_plesk_instance');
8888
}
8989
}
9090
if (!isset($sharedIp)) {
91-
myadmin_log(self::$module, 'critical', 'Plesk Could not find any shared IP addresses', __LINE__, __FILE__);
91+
myadmin_log(self::$module, 'critical', 'Plesk Could not find any shared IP addresses', __LINE__, __FILE__, self::$module, $serviceClass->getId());
9292
$event['success'] = false;
9393
$event->stopPropagation();
9494
return;
@@ -97,7 +97,7 @@ function_requirements('get_webhosting_plesk_instance');
9797
try {
9898
$result = $plesk->listServicePlans();
9999
} catch (ApiRequestException $e) {
100-
myadmin_log(self::$module, 'info', 'listServicePlans Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
100+
myadmin_log(self::$module, 'info', 'listServicePlans Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
101101
$event['success'] = false;
102102
$event->stopPropagation();
103103
return;
@@ -112,7 +112,7 @@ function_requirements('get_webhosting_plesk_instance');
112112
}
113113
}
114114
if (!isset($planId)) {
115-
myadmin_log(self::$module, 'critical', 'Plesk Could not find the appropriate service plan', __LINE__, __FILE__);
115+
myadmin_log(self::$module, 'critical', 'Plesk Could not find the appropriate service plan', __LINE__, __FILE__, self::$module, $serviceClass->getId());
116116
$event['success'] = false;
117117
$event->stopPropagation();
118118
return;
@@ -127,11 +127,11 @@ function_requirements('get_webhosting_plesk_instance');
127127
'password' => $password
128128
];
129129
try {
130-
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__);
130+
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
131131
$result = $plesk->createClient($request);
132132
} catch (ApiRequestException $e) {
133133
$error = $e->getMessage();
134-
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
134+
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
135135
}
136136
if (!isset($result['id'])) {
137137
$cantFix = false;
@@ -142,26 +142,26 @@ function_requirements('get_webhosting_plesk_instance');
142142
$passwordUpdated = true;
143143
$password = Plesk::randomString(16);
144144
$request['password'] = $password;
145-
myadmin_log(self::$module, 'info', "Generated '{$request['password']}' for a replacement password and trying again", __LINE__, __FILE__);
145+
myadmin_log(self::$module, 'info', "Generated '{$request['password']}' for a replacement password and trying again", __LINE__, __FILE__, self::$module, $serviceClass->getId());
146146
try {
147-
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__);
147+
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
148148
$result = $plesk->createClient($request);
149149
} catch (ApiRequestException $e) {
150150
$error = $e->getMessage();
151-
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
151+
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
152152
}
153153
} elseif (mb_strpos($error, 'Error #1007') !== false) {
154154
// Error #1007 User account already exists.
155155
$usernameUpdated = true;
156156
$username = mb_substr($username, 0, 7).strtolower(Plesk::randomString(1));
157157
$request['username'] = $username;
158-
myadmin_log(self::$module, 'info', "Generated '{$request['username']}' for a replacement username and trying again", __LINE__, __FILE__);
158+
myadmin_log(self::$module, 'info', "Generated '{$request['username']}' for a replacement username and trying again", __LINE__, __FILE__, self::$module, $serviceClass->getId());
159159
try {
160-
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__);
160+
myadmin_log(self::$module, 'DEBUG', 'createClient called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
161161
$result = $plesk->createClient($request);
162162
} catch (ApiRequestException $e) {
163163
$error = $e->getMessage();
164-
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
164+
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
165165
}
166166
} else {
167167
$cantFix = true;
@@ -173,10 +173,10 @@ function_requirements('get_webhosting_plesk_instance');
173173
}
174174
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'plesk', 'createClient', $request, $result);
175175
if (!isset($result['id'])) {
176-
//myadmin_log(self::$module, 'info', 'createClient did not return the expected id information: '.$e->getMessage(), __LINE__, __FILE__);
177-
myadmin_log(self::$module, 'info', 'createClient did not return the expected id', __LINE__, __FILE__);
176+
//myadmin_log(self::$module, 'info', 'createClient did not return the expected id information: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
177+
myadmin_log(self::$module, 'info', 'createClient did not return the expected id', __LINE__, __FILE__, self::$module, $serviceClass->getId());
178178
if (is_array($extra) && isset($extra[0]) && is_numeric($extra[0]) && $extra[0] > 0) {
179-
myadmin_log(self::$module, 'info', 'continuing using pre-existing client id', __LINE__, __FILE__);
179+
myadmin_log(self::$module, 'info', 'continuing using pre-existing client id', __LINE__, __FILE__, self::$module, $serviceClass->getId());
180180
$accountId = $extra[0];
181181
} else {
182182
$event['success'] = false;
@@ -198,7 +198,7 @@ function_requirements('get_webhosting_plesk_instance');
198198
$db = get_module_db(self::$module);
199199
$serExtra = $db->real_escape(myadmin_stringify($extra));
200200
$db->query("update {$settings['TABLE']} set {$settings['PREFIX']}_ip='{$ip}', {$settings['PREFIX']}_extra='{$serExtra}' where {$settings['PREFIX']}_id='{$serviceClass->getId()}'", __LINE__, __FILE__);
201-
myadmin_log(self::$module, 'info', "createClient got client id {$accountId}", __LINE__, __FILE__);
201+
myadmin_log(self::$module, 'info', "createClient got client id {$accountId}", __LINE__, __FILE__, self::$module, $serviceClass->getId());
202202
//$plesk->debug = TRUE;
203203
//$debugCalls = TRUE;
204204
$request = [
@@ -213,16 +213,16 @@ function_requirements('get_webhosting_plesk_instance');
213213
];
214214
$result = [];
215215
try {
216-
myadmin_log(self::$module, 'info', 'createSubscription called with '.json_encode($request), __LINE__, __FILE__);
216+
myadmin_log(self::$module, 'info', 'createSubscription called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
217217
$result = $plesk->createSubscription($request);
218218
} catch (ApiRequestException $e) {
219-
myadmin_log(self::$module, 'warning', ' createSubscription Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
219+
myadmin_log(self::$module, 'warning', ' createSubscription Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
220220
try {
221-
myadmin_log(self::$module, 'info', 'deleteClient called with '.json_encode($request), __LINE__, __FILE__);
221+
myadmin_log(self::$module, 'info', 'deleteClient called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
222222
$result = $plesk->deleteClient(['login' => $username]);
223223
} catch (ApiRequestException $e) {
224224
$error = $e->getMessage();
225-
myadmin_log(self::$module, 'warning', 'deleteClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
225+
myadmin_log(self::$module, 'warning', 'deleteClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
226226
}
227227
$event['success'] = false;
228228
$event->stopPropagation();
@@ -238,13 +238,13 @@ function_requirements('get_webhosting_plesk_instance');
238238
$usernameUpdated = true;
239239
$username = mb_substr($username, 0, 7).strtolower(Plesk::randomString(1));
240240
$request['ftp_login'] = $username;
241-
myadmin_log(self::$module, 'info', "Generated '{$request['ftp_login']}' for a replacement username and trying again", __LINE__, __FILE__);
241+
myadmin_log(self::$module, 'info', "Generated '{$request['ftp_login']}' for a replacement username and trying again", __LINE__, __FILE__, self::$module, $serviceClass->getId());
242242
try {
243-
myadmin_log(self::$module, 'DEBUG', 'createSubscription called with '.json_encode($request), __LINE__, __FILE__);
243+
myadmin_log(self::$module, 'DEBUG', 'createSubscription called with '.json_encode($request), __LINE__, __FILE__, self::$module, $serviceClass->getId());
244244
$result = $plesk->createSubscription($request);
245245
} catch (ApiRequestException $e) {
246246
$error = $e->getMessage();
247-
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
247+
myadmin_log(self::$module, 'info', 'createClient Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
248248
}
249249
} else {
250250
$cantFix = true;
@@ -253,7 +253,7 @@ function_requirements('get_webhosting_plesk_instance');
253253
}
254254
request_log(self::$module, $serviceClass->getCustid(), __FUNCTION__, 'plesk', 'createSubscription', $request, $result);
255255
if (!isset($result['id'])) {
256-
myadmin_log(self::$module, 'info', 'createSubscription did not return the expected id information: '.$e->getMessage(), __LINE__, __FILE__);
256+
myadmin_log(self::$module, 'info', 'createSubscription did not return the expected id information: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
257257
$event['success'] = false;
258258
$event->stopPropagation();
259259
return;
@@ -265,7 +265,7 @@ function_requirements('get_webhosting_plesk_instance');
265265
if ($debugCalls == true) {
266266
echo 'plesk->createSubscription('.var_export($request, true).') = '.var_export($result, true).PHP_EOL;
267267
}
268-
myadmin_log(self::$module, 'info', "createSubscription got Subscription ID {$subscriptoinId}\n", __LINE__, __FILE__);
268+
myadmin_log(self::$module, 'info', "createSubscription got Subscription ID {$subscriptoinId}\n", __LINE__, __FILE__, self::$module, $serviceClass->getId());
269269
if (is_numeric($subscriptoinId)) {
270270
website_welcome_email($serviceClass->getId());
271271
}
@@ -290,7 +290,7 @@ function_requirements('get_webhosting_plesk_instance');
290290
} catch (ApiRequestException $e) {
291291
echo 'Caught exception: '.$e->getMessage().PHP_EOL;
292292
}
293-
myadmin_log(self::$module, 'info', 'updateClient Called got '.json_encode($result), __LINE__, __FILE__);
293+
myadmin_log(self::$module, 'info', 'updateClient Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
294294
$event->stopPropagation();
295295
}
296296
}
@@ -310,9 +310,9 @@ function_requirements('get_webhosting_plesk_instance');
310310
$request = ['username' => $serviceClass->getUsername(), 'status' => 1];
311311
try {
312312
$result = $plesk->updateClient($request);
313-
myadmin_log(self::$module, 'info', 'updateClient('.json_encode($request).') Called got '.json_encode($result), __LINE__, __FILE__);
313+
myadmin_log(self::$module, 'info', 'updateClient('.json_encode($request).') Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
314314
} catch (ApiRequestException $e) {
315-
myadmin_log(self::$module, 'info', 'updateClient('.json_encode($request).') Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
315+
myadmin_log(self::$module, 'info', 'updateClient('.json_encode($request).') Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
316316
}
317317
$event->stopPropagation();
318318
}
@@ -343,25 +343,25 @@ function_requirements('get_webhosting_plesk_instance');
343343
try {
344344
$result = $plesk->deleteSite($request);
345345
} catch (\Exception $e) {
346-
myadmin_log('plesk', 'error', 'deleteSite Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
346+
myadmin_log('plesk', 'error', 'deleteSite Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
347347
echo 'Caught exception: '.$e->getMessage().PHP_EOL;
348348
}
349-
myadmin_log(self::$module, 'info', 'deleteSite Called got '.json_encode($result), __LINE__, __FILE__);
349+
myadmin_log(self::$module, 'info', 'deleteSite Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
350350
*/
351351
$request = ['id' => $subscriptoinId];
352352
try {
353353
$result = $plesk->deleteSubscription($request);
354-
myadmin_log(self::$module, 'info', 'deleteSubscription Called got '.json_encode($result), __LINE__, __FILE__);
354+
myadmin_log(self::$module, 'info', 'deleteSubscription Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
355355
} catch (\Exception $e) {
356-
myadmin_log('plesk', 'error', 'deleteSubscription id:'.$subscriptoinId.' Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
356+
myadmin_log('plesk', 'error', 'deleteSubscription id:'.$subscriptoinId.' Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
357357
echo 'Caught exception: '.$e->getMessage().PHP_EOL;
358358
}
359359
$request = ['id' => $userId];
360360
try {
361361
$result = $plesk->deleteClient($request);
362-
myadmin_log(self::$module, 'info', 'deleteClient Called got '.json_encode($result), __LINE__, __FILE__);
362+
myadmin_log(self::$module, 'info', 'deleteClient Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
363363
} catch (\Exception $e) {
364-
myadmin_log('plesk', 'error', 'deleteClient id:'.$userId.' Caught exception: '.$e->getMessage(), __LINE__, __FILE__);
364+
myadmin_log('plesk', 'error', 'deleteClient id:'.$userId.' Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
365365
echo 'Caught exception: '.$e->getMessage().PHP_EOL;
366366
}
367367
return true;
@@ -377,7 +377,7 @@ public static function getChangeIp(GenericEvent $event)
377377
$serviceClass = $event->getSubject();
378378
$settings = get_module_settings(self::$module);
379379
$plesk = new Plesk(FANTASTICO_USERNAME, FANTASTICO_PASSWORD);
380-
myadmin_log(self::$module, 'info', 'IP Change - (OLD:'.$serviceClass->getIp().") (NEW:{$event['newip']})", __LINE__, __FILE__);
380+
myadmin_log(self::$module, 'info', 'IP Change - (OLD:'.$serviceClass->getIp().") (NEW:{$event['newip']})", __LINE__, __FILE__, self::$module, $serviceClass->getId());
381381
$result = $plesk->editIp($serviceClass->getIp(), $event['newip']);
382382
if (isset($result['faultcode'])) {
383383
myadmin_log(self::$module, 'error', 'Plesk editIp('.$serviceClass->getIp().', '.$event['newip'].') returned Fault '.$result['faultcode'].': '.$result['fault'], __LINE__, __FILE__, self::$module);

0 commit comments

Comments
 (0)