From a015c0f7830bc7e52d43f91917eef5b223ec7f11 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Sat, 10 Aug 2024 18:41:09 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D1=83=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D0=B6=D0=B8=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/kz/istt/locust/DbOpenHelper.java     |  8 ++++----
 .../main/java/kz/istt/locust/MySynchronizationOld.java | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/kz/istt/locust/DbOpenHelper.java b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
index 66bf718..3207ae5 100644
--- a/app/src/main/java/kz/istt/locust/DbOpenHelper.java
+++ b/app/src/main/java/kz/istt/locust/DbOpenHelper.java
@@ -1608,10 +1608,10 @@ public class DbOpenHelper extends SQLiteOpenHelper
 		if(tbl==null) return false;
 
 		Cursor cursor;
-		if(tbl.name.equals("countries"))
-			Log.i("igor", "tbl0=" + tbl.name);
-		if(tbl.name.equals("countriesregions"))
-			Log.i("igor", "tbl0=" + tbl.name);
+		//if(tbl.name.equals("countries"))
+		//	Log.i("igor", "tbl0=" + tbl.name);
+		//if(tbl.name.equals("countriesregions"))
+		//	Log.i("igor", "tbl0=" + tbl.name);
 
 		//Проверка на существование полей
 		Boolean[] fb=new Boolean[tbl.fields.size()]; //Для проверки существования полей в локальной таблице
diff --git a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
index 0de0998..aedfec8 100644
--- a/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
+++ b/app/src/main/java/kz/istt/locust/MySynchronizationOld.java
@@ -948,15 +948,15 @@ class MyThread extends Thread
 
                 try {
                     sleep(tsk.wait); //Если в задании задано сколько подождать перед запуском
-                } catch (InterruptedException e) {
-					Log.i("igor", "InterruptedException");
+                } catch (InterruptedException ex) {
+					Log.i("igor", "Sleep error",ex);
 				}
 
                 try
                 {
 					URL url = new URL(tsk.url);
 					HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-					conn.setReadTimeout(15000);
+					conn.setReadTimeout(60000); //60000 = 60 секунд
 					conn.setConnectTimeout(15000);
 					conn.setRequestMethod("POST");
 
@@ -1058,7 +1058,7 @@ class MyThread extends Thread
 					}
 				} catch (Exception ex) {
 					bError = true;
-					Log.i("igor", ex.toString());
+					Log.i("igor", "URL = "+tsk.url,ex);
 				}
 /*
                     HttpClient httpClient = new DefaultHttpClient();
@@ -1132,7 +1132,7 @@ class MyThread extends Thread
                     tsk.s = false; //Отмечаем как не отправленное
                     tsk.t++; //Увеличиваем счётчик количество попыток отправки
 
-                    if(tsk.t>10) //Удаляем задание после 10 попыток отправки
+                    if(tsk.t>5) //Удаляем задание после 10 попыток отправки
                     {
                         try {
                             mSemaphore.acquire();