Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementazione della logica di retry per Guzzle HTTP Client #39

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Implementazione della logica di retry per Guzzle HTTP Client #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
24993e7
Implemented custom HttpClient wrapper class to handle retry logic for…
SamuPert May 5, 2024
0403a67
Use the new HttpClient with retry logic
SamuPert May 5, 2024
d813313
Update composer
SamuPert May 5, 2024
5b952cc
Update piracy shield every 5 minutes instead of 10
SamuPert May 6, 2024
8d5aad5
Improved logging in the Http Client
SamuPert May 6, 2024
11edb5a
Fixed error for null response
SamuPert May 6, 2024
25c85ac
Fixed a bug in the HttpClient regarding the retry logic
SamuPert May 6, 2024
2dc7b2e
Fixed a few bugs in the HttpClient class, incremented the retry delay…
SamuPert May 7, 2024
0d10c81
Set default timezone to CET
SamuPert May 7, 2024
d97d657
Reduced the connect timeout to 20 seconds for the get_all_tickets met…
SamuPert May 7, 2024
90c0cb3
Retry request on RequestException too
SamuPert May 7, 2024
ddeb308
Increase the default timeout to 20 s
SamuPert May 7, 2024
dc2d6b4
Fixed old connect_timeout
SamuPert May 7, 2024
fb29934
Increased the default retries for http requests to 20
SamuPert May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions installed_ps.openaccessitalia.org/app/Http/Controllers/ADMController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private static function get_href($html){

private function find_betting_files_url(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"adm_system","trying to find betting adm blacklist links");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try {
$response = $client->get(env("ADM_BETTING_URL"));
}catch(\GuzzleHttp\Exception\BadResponseException $e){
Expand Down Expand Up @@ -157,7 +157,7 @@ private function parse_betting_file($save){

private function find_smoking_files_url(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"adm_system","trying to find smoking adm blacklist links");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try {
$response = $client->get(env("ADM_SMOKING_URL"));
}catch(\GuzzleHttp\Exception\BadResponseException $e){
Expand Down
34 changes: 17 additions & 17 deletions installed_ps.openaccessitalia.org/app/Http/Controllers/PiracyController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ private static function new_login(){
$body_request = new \StdClass();
$body_request->email = env("PIRACY_SHIELD_MAIL");
$body_request->password = env("PIRACY_SHIELD_PSW");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->post($endpoint,["json" => $body_request,'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -745,7 +745,7 @@ private static function refresh_login($token){
$endpoint = self::buildUrl("/api/v1/authentication/refresh");
$body_request = new \StdClass();
$body_request->refresh_token = $token;
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->post($endpoint,["json" => $body_request,'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -798,7 +798,7 @@ private static function logout(){
$endpoint = self::buildUrl("/api/v1/authentication/logout");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -851,7 +851,7 @@ private static function get_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -920,7 +920,7 @@ private static function get_all_tickets($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token", 'Accept-Encoding' => 'gzip'], 'connect_timeout' => 60, 'decode_content' => 'gzip']);
if($response->getBody()){
Expand Down Expand Up @@ -991,7 +991,7 @@ private static function get_fqdns_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/fqdn");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1060,7 +1060,7 @@ private static function get_ipv4s_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/ipv4");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1129,7 +1129,7 @@ private static function get_ipv6s_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/ipv6");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1198,7 +1198,7 @@ private static function get_all_fqdns_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/fqdn/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1269,7 +1269,7 @@ private static function get_all_ipv4s_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ipv4/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1340,7 +1340,7 @@ private static function get_all_ipv6s_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ipv6/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1411,7 +1411,7 @@ private static function set_item_processed($ticket_item,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/item/set/processed");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->value = $ticket_item;
try{
Expand Down Expand Up @@ -1480,7 +1480,7 @@ private static function set_item_unprocessed($ticket_item,$reason,$is_retry = fa
$endpoint = self::buildUrl("/api/v1/ticket/item/set/unprocessed");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->value = $ticket_item;
$body_request->reason = $reason;
Expand Down Expand Up @@ -1550,7 +1550,7 @@ private static function get_whitelist($is_retry = false){
$endpoint = self::buildUrl("/api/v1/whitelist/item/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -1621,7 +1621,7 @@ private static function delete_whitelist($genre,$item,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/whitelist/item/remove");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->item = $item;
try{
Expand Down Expand Up @@ -1690,7 +1690,7 @@ private static function add_whitelist($genre,$item,$attr_name,$attr,$is_retry =
$endpoint = self::buildUrl("/api/v1/whitelist/item/create");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->genre = $genre;
$body_request->item = $item;
Expand Down Expand Up @@ -1759,7 +1759,7 @@ private static function add_whitelist($genre,$item,$attr_name,$attr,$is_retry =
public static function ping(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"piracy_system","trying to ping system");
$endpoint = self::buildUrl("/api/v1/ping");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['connect_timeout' => 5]);
if($response->getBody()){
Expand Down
6 changes: 3 additions & 3 deletions ps.openaccessitalia.org-main/app/Console/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ protected function schedule(Schedule $schedule)
//UPDATE ADM BLACKLISTS
$schedule->call('App\Http\Controllers\ADMController@update_blacklists')->timezone('Europe/Rome')->dailyAt('9:00');
//UPDATE PIRACY SHIELD
$schedule->call('App\Http\Controllers\PiracyController@run')->timezone('Europe/Rome')->everyTenMinutes();
$schedule->call('App\Http\Controllers\PiracyController@run')->timezone('Europe/Rome')->everyFiveMinutes();
//UPDATE DNS
$schedule->call('App\Http\Controllers\Admin\AdminController@update_dns')->timezone('Europe/Rome')->everyTenMinutes();
$schedule->call('App\Http\Controllers\Admin\AdminController@update_dns')->timezone('Europe/Rome')->everyFiveMinutes();
//UPDATE BGP
$schedule->call('App\Http\Controllers\Admin\AdminController@update_bgp')->timezone('Europe/Rome')->everyTenMinutes();
$schedule->call('App\Http\Controllers\Admin\AdminController@update_bgp')->timezone('Europe/Rome')->everyFiveMinutes();
//LOG RETENTION
$schedule->call('App\Http\Controllers\Admin\AdminController@log_retention')->timezone('Europe/Rome')->hourly();
}
Expand Down
4 changes: 2 additions & 2 deletions ps.openaccessitalia.org-main/app/Http/Controllers/ADMController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private static function get_href($html){

private function find_betting_files_url(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"adm_system","trying to find betting adm blacklist links");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try {
$response = $client->get(env("ADM_BETTING_URL"));
}catch(\GuzzleHttp\Exception\BadResponseException $e){
Expand Down Expand Up @@ -157,7 +157,7 @@ private function parse_betting_file($save){

private function find_smoking_files_url(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"adm_system","trying to find smoking adm blacklist links");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try {
$response = $client->get(env("ADM_SMOKING_URL"));
}catch(\GuzzleHttp\Exception\BadResponseException $e){
Expand Down
34 changes: 17 additions & 17 deletions ps.openaccessitalia.org-main/app/Http/Controllers/PiracyController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ private static function new_login(){
$body_request = new \StdClass();
$body_request->email = env("PIRACY_SHIELD_MAIL");
$body_request->password = env("PIRACY_SHIELD_PSW");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->post($endpoint,["json" => $body_request,'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -745,7 +745,7 @@ private static function refresh_login($token){
$endpoint = self::buildUrl("/api/v1/authentication/refresh");
$body_request = new \StdClass();
$body_request->refresh_token = $token;
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->post($endpoint,["json" => $body_request,'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -798,7 +798,7 @@ private static function logout(){
$endpoint = self::buildUrl("/api/v1/authentication/logout");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -851,7 +851,7 @@ private static function get_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -920,7 +920,7 @@ private static function get_all_tickets($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token", 'Accept-Encoding' => 'gzip'], 'connect_timeout' => 60, 'decode_content' => 'gzip']);
if($response->getBody()){
Expand Down Expand Up @@ -991,7 +991,7 @@ private static function get_fqdns_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/fqdn");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1060,7 +1060,7 @@ private static function get_ipv4s_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/ipv4");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1129,7 +1129,7 @@ private static function get_ipv6s_from_ticket($ticket_id,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/get/ipv6");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->ticket_id = $ticket_id;
try{
Expand Down Expand Up @@ -1198,7 +1198,7 @@ private static function get_all_fqdns_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/fqdn/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1269,7 +1269,7 @@ private static function get_all_ipv4s_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ipv4/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1340,7 +1340,7 @@ private static function get_all_ipv6s_json($is_retry = false){
$endpoint = self::buildUrl("/api/v1/ipv6/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 10]);
if($response->getBody()){
Expand Down Expand Up @@ -1411,7 +1411,7 @@ private static function set_item_processed($ticket_item,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/ticket/item/set/processed");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->value = $ticket_item;
try{
Expand Down Expand Up @@ -1480,7 +1480,7 @@ private static function set_item_unprocessed($ticket_item,$reason,$is_retry = fa
$endpoint = self::buildUrl("/api/v1/ticket/item/set/unprocessed");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->value = $ticket_item;
$body_request->reason = $reason;
Expand Down Expand Up @@ -1550,7 +1550,7 @@ private static function get_whitelist($is_retry = false){
$endpoint = self::buildUrl("/api/v1/whitelist/item/get/all");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['headers' => ['Authorization' => "Bearer $access_token"],'connect_timeout' => 5]);
if($response->getBody()){
Expand Down Expand Up @@ -1621,7 +1621,7 @@ private static function delete_whitelist($genre,$item,$is_retry = false){
$endpoint = self::buildUrl("/api/v1/whitelist/item/remove");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->item = $item;
try{
Expand Down Expand Up @@ -1690,7 +1690,7 @@ private static function add_whitelist($genre,$item,$attr_name,$attr,$is_retry =
$endpoint = self::buildUrl("/api/v1/whitelist/item/create");
$access_token = self::get_access_token(false);
if($access_token){
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
$body_request = new \StdClass();
$body_request->genre = $genre;
$body_request->item = $item;
Expand Down Expand Up @@ -1759,7 +1759,7 @@ private static function add_whitelist($genre,$item,$attr_name,$attr,$is_retry =
public static function ping(){
\App\Http\Controllers\Admin\ActionLogController::log(0,"piracy_system","trying to ping system");
$endpoint = self::buildUrl("/api/v1/ping");
$client = new \GuzzleHttp\Client();
$client = new \App\Http\HttpClient();
try{
$response = $client->get($endpoint,['connect_timeout' => 5]);
if($response->getBody()){
Expand Down
Loading