From c6d18f49e74045717ce9c309a01bc8832c4e4192 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 2 Jan 2018 20:45:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=BA=20?= =?UTF-8?q?=D0=B2=20statsd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/models/OauthProcess.php | 15 +++++++++------ api/modules/session/models/JoinForm.php | 2 +- common/tasks/SendCurrentEmailConfirmation.php | 2 ++ common/tasks/SendNewEmailConfirmation.php | 2 ++ common/tasks/SendPasswordRecoveryEmail.php | 1 + common/tasks/SendRegistrationEmail.php | 1 + 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/api/models/OauthProcess.php b/api/models/OauthProcess.php index 5d50582..bfc6021 100644 --- a/api/models/OauthProcess.php +++ b/api/models/OauthProcess.php @@ -126,8 +126,8 @@ class OauthProcess { /** * Метод выполняется сервером приложения, которому был выдан auth_token или refresh_token. * - * Входными данными является стандартный список GET параметров по стандарту oAuth: - * $_GET = [ + * Входными данными является стандартный список POST параметров по стандарту oAuth: + * $_POST = [ * client_id, * client_secret, * redirect_uri, @@ -135,7 +135,7 @@ class OauthProcess { * grant_type, * ] * для запроса grant_type = authentication_code. - * $_GET = [ + * $_POST = [ * client_id, * client_secret, * refresh_token, @@ -145,12 +145,15 @@ class OauthProcess { * @return array */ public function getToken(): array { + $grantType = Yii::$app->request->post('grant_type', 'null'); try { - Yii::$app->statsd->inc('oauth.issueToken.attempt'); + Yii::$app->statsd->inc("oauth.issueToken_{$grantType}.attempt"); $response = $this->server->issueAccessToken(); - Yii::$app->statsd->inc('oauth.issueToken.success'); + $clientId = Yii::$app->request->post('client_id'); + Yii::$app->statsd->inc("oauth.issueToken_client.{$clientId}"); + Yii::$app->statsd->inc("oauth.issueToken_{$grantType}.success"); } catch (OAuthException $e) { - Yii::$app->statsd->inc('oauth.issueToken.fail'); + Yii::$app->statsd->inc("oauth.issueToken_{$grantType}.fail"); Yii::$app->response->statusCode = $e->httpStatusCode; $response = [ 'error' => $e->errorType, diff --git a/api/modules/session/models/JoinForm.php b/api/modules/session/models/JoinForm.php index f53d7f5..8b47053 100644 --- a/api/modules/session/models/JoinForm.php +++ b/api/modules/session/models/JoinForm.php @@ -53,7 +53,7 @@ class JoinForm extends Model { $serverId = $this->serverId; $accessToken = $this->accessToken; Session::info("User with access_token = '{$accessToken}' trying join to server with server_id = '{$serverId}'."); - Yii::$app->statsd->inc('sessionserver.join.attempts'); + Yii::$app->statsd->inc('sessionserver.join.attempt'); if (!$this->validate()) { return false; } diff --git a/common/tasks/SendCurrentEmailConfirmation.php b/common/tasks/SendCurrentEmailConfirmation.php index 55e96ef..fe0285e 100644 --- a/common/tasks/SendCurrentEmailConfirmation.php +++ b/common/tasks/SendCurrentEmailConfirmation.php @@ -5,6 +5,7 @@ namespace common\tasks; use common\emails\EmailHelper; use common\emails\templates\ChangeEmailConfirmCurrentEmail; use common\models\confirmations\CurrentEmailConfirmation; +use Yii; use yii\queue\RetryableJobInterface; class SendCurrentEmailConfirmation implements RetryableJobInterface { @@ -36,6 +37,7 @@ class SendCurrentEmailConfirmation implements RetryableJobInterface { * @param \yii\queue\Queue $queue */ public function execute($queue) { + Yii::$app->statsd->inc('queue.sendCurrentEmailConfirmation.attempt'); $to = EmailHelper::buildTo($this->username, $this->email); $template = new ChangeEmailConfirmCurrentEmail($to, $this->code); $template->send(); diff --git a/common/tasks/SendNewEmailConfirmation.php b/common/tasks/SendNewEmailConfirmation.php index 25d4edc..da034ff 100644 --- a/common/tasks/SendNewEmailConfirmation.php +++ b/common/tasks/SendNewEmailConfirmation.php @@ -5,6 +5,7 @@ namespace common\tasks; use common\emails\EmailHelper; use common\emails\templates\ChangeEmailConfirmNewEmail; use common\models\confirmations\NewEmailConfirmation; +use Yii; use yii\queue\RetryableJobInterface; class SendNewEmailConfirmation implements RetryableJobInterface { @@ -36,6 +37,7 @@ class SendNewEmailConfirmation implements RetryableJobInterface { * @param \yii\queue\Queue $queue */ public function execute($queue) { + Yii::$app->statsd->inc('queue.sendNewEmailConfirmation.attempt'); $to = EmailHelper::buildTo($this->username, $this->email); $template = new ChangeEmailConfirmNewEmail($to, $this->username, $this->code); $template->send(); diff --git a/common/tasks/SendPasswordRecoveryEmail.php b/common/tasks/SendPasswordRecoveryEmail.php index 394ab75..0dba85b 100644 --- a/common/tasks/SendPasswordRecoveryEmail.php +++ b/common/tasks/SendPasswordRecoveryEmail.php @@ -47,6 +47,7 @@ class SendPasswordRecoveryEmail implements RetryableJobInterface { * @throws \common\emails\exceptions\CannotSendEmailException */ public function execute($queue) { + Yii::$app->statsd->inc('queue.sendPasswordRecovery.attempt'); $params = new ForgotPasswordParams($this->username, $this->code, $this->link); $to = EmailHelper::buildTo($this->username, $this->email); $template = new ForgotPasswordEmail($to, $this->locale, $params); diff --git a/common/tasks/SendRegistrationEmail.php b/common/tasks/SendRegistrationEmail.php index f6aebc5..a960e96 100644 --- a/common/tasks/SendRegistrationEmail.php +++ b/common/tasks/SendRegistrationEmail.php @@ -47,6 +47,7 @@ class SendRegistrationEmail implements RetryableJobInterface { * @throws \common\emails\exceptions\CannotSendEmailException */ public function execute($queue) { + Yii::$app->statsd->inc('queue.sendRegistrationEmail.attempt'); $params = new RegistrationEmailParams($this->username, $this->code, $this->link); $to = EmailHelper::buildTo($this->username, $this->email); $template = new RegistrationEmail($to, $this->locale, $params);