diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5fd8463..f95200e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,13 +5,14 @@ - + + @@ -39,41 +40,50 @@ - - + + - - - - - + + - - + + - - + + - + - - + + - + + + + + + + + + + + + + @@ -81,21 +91,59 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - + @@ -168,24 +216,24 @@ @@ -317,6 +365,7 @@ + @@ -485,9 +534,8 @@ - - + @@ -904,7 +952,8 @@ - + + 1434854005227 @@ -1026,11 +1075,17 @@ - - @@ -1056,11 +1111,9 @@ - - @@ -1070,23 +1123,25 @@ + + - + - + - + @@ -1098,8 +1153,8 @@ - + @@ -1132,16 +1187,16 @@ - - @@ -1259,9 +1310,6 @@ - - - @@ -1269,9 +1317,6 @@ - - - @@ -1289,9 +1334,6 @@ - - - @@ -1324,9 +1366,6 @@ - - - @@ -1334,7 +1373,6 @@ - @@ -1342,9 +1380,6 @@ - - - @@ -1352,7 +1387,6 @@ - @@ -1367,11 +1401,6 @@ - - - - - @@ -1391,39 +1420,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1436,50 +1432,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1487,7 +1439,6 @@ - @@ -1503,18 +1454,6 @@ - - - - - - - - - - - - @@ -1522,7 +1461,6 @@ - @@ -1534,29 +1472,10 @@ - - - - - - - - - - - - - - - - - - - @@ -1578,22 +1497,31 @@ - + - - + + + + + + + + + + + + + - + - - + + - - @@ -1603,37 +1531,57 @@ - + - + - - + + - + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + - - + + @@ -1646,22 +1594,82 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/telegram/SenderHelper.java b/src/main/java/org/telegram/SenderHelper.java index cd6aa87..83fb12f 100644 --- a/src/main/java/org/telegram/SenderHelper.java +++ b/src/main/java/org/telegram/SenderHelper.java @@ -57,8 +57,8 @@ public class SenderHelper { nameValuePairs.add(new BasicNameValuePair(SendMessage.REPLYTOMESSAGEID_FIELD, message.getReplayToMessageId().toString())); } httppost.setEntity(new UrlEncodedFormEntity(nameValuePairs, "UTF-8")); - log.warning(httppost.toString()); - log.warning(nameValuePairs.toString()); + log.debug(httppost.toString()); + log.debug(nameValuePairs.toString()); CloseableHttpResponse response = httpclient.execute(httppost); HttpEntity ht = response.getEntity(); @@ -72,7 +72,7 @@ public class SenderHelper { JSONObject jsonMessage = jsonObject.getJSONObject("result"); return new Message(jsonMessage); } catch (IOException e) { - e.printStackTrace(); + log.error(e); return null; } } @@ -114,7 +114,7 @@ public class SenderHelper { fileToDelete.delete(); } } catch (IOException e) { - e.printStackTrace(); + log.error(e); } } @@ -135,7 +135,7 @@ public class SenderHelper { String responseContent = EntityUtils.toString(buf, "UTF-8"); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } } diff --git a/src/main/java/org/telegram/services/BotLogger.java b/src/main/java/org/telegram/services/BotLogger.java index 7555bf7..fe1ee41 100644 --- a/src/main/java/org/telegram/services/BotLogger.java +++ b/src/main/java/org/telegram/services/BotLogger.java @@ -55,7 +55,7 @@ public class BotLogger { logger = Logger.getLogger(classname); logger.setLevel(Level.WARNING); ConsoleHandler handler = new ConsoleHandler(); - handler.setLevel(Level.ALL); + handler.setLevel(Level.WARNING); logger.addHandler(handler); lastFileDate = new GregorianCalendar(); if (currentFileName == null || currentFileName.length() == 0) { diff --git a/src/main/java/org/telegram/services/DirectionsService.java b/src/main/java/org/telegram/services/DirectionsService.java index b142de7..78bacbc 100644 --- a/src/main/java/org/telegram/services/DirectionsService.java +++ b/src/main/java/org/telegram/services/DirectionsService.java @@ -27,6 +27,8 @@ import java.util.List; * @date 20 of June of 2015 */ public class DirectionsService { + private static volatile BotLogger log = BotLogger.getLogger(DirectionsService.class.getName()); + private static final String BASEURL = "https://maps.googleapis.com/maps/api/directions/json"; ///< Base url for REST private static final String APIIDEND = "&key=" + BuildVars.DirectionsApiKey; private static final String PARAMS = "&language=en&units=metric"; @@ -96,6 +98,7 @@ public class DirectionsService { responseToUser.add("Directions not found between " + origin + " and " + destination); } } catch (Exception e) { + log.warning(e); responseToUser.add("Error fetching weather info"); } return responseToUser; diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index 282e075..e5519a2 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -19,6 +19,8 @@ import java.io.*; * @date 21 of June of 2015 */ public class TransifexService { + private static volatile BotLogger log = BotLogger.getLogger(TransifexService.class.getName()); + private static final String BASEURLAndroid = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/telegram/resource/stringsxml-48/translation/@language?file"; ///< Base url for REST private static final String BASEURLiOS = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/iphone-1/resource/localizablestrings/translation/@language?file"; ///< Base url for REST private static final String BASEURLOSX = "http://" + BuildVars.TRANSIFEXUSER + ":" + BuildVars.TRANSIFEXPASSWORD + "@www.transifex.com/api/2/project/osx/resource/localizablestrings/translation/@language?file"; ///< Base url for REST @@ -74,7 +76,7 @@ public class TransifexService { result = responseString; } } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -87,7 +89,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -100,7 +102,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -113,7 +115,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -126,7 +128,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -139,7 +141,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -152,7 +154,7 @@ public class TransifexService { HttpResponse response = client.execute(request); result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); } catch (IOException e) { - e.printStackTrace(); + log.error(e); } return result; } @@ -192,11 +194,11 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); } catch (FileNotFoundException e) { - e.printStackTrace(); + log.error(e); } } } catch (Exception e) { - e.printStackTrace(); + log.error(e); } return sendDocument; } @@ -219,7 +221,7 @@ public class TransifexService { sendDocument = new SendDocument(); sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); } catch (FileNotFoundException e) { - e.printStackTrace(); + log.error(e); } } } catch (Exception e) { diff --git a/src/main/java/org/telegram/services/WeatherService.java b/src/main/java/org/telegram/services/WeatherService.java index e324843..59ed71c 100644 --- a/src/main/java/org/telegram/services/WeatherService.java +++ b/src/main/java/org/telegram/services/WeatherService.java @@ -32,6 +32,7 @@ import java.time.format.DateTimeFormatter; */ public class WeatherService { private static volatile BotLogger log = BotLogger.getLogger(WeatherService.class.getName()); + private static final String BASEURL = "http://api.openweathermap.org/data/2.5/"; ///< Base url for REST private static final String FORECASTPATH = "forecast/daily"; private static final String CURRENTPATH = "weather"; diff --git a/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java b/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java index 1234107..7d85366 100644 --- a/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java +++ b/src/main/java/org/telegram/updatesreceivers/UpdatesThread.java @@ -114,15 +114,15 @@ public class UpdatesThread { this.wait(500); } } catch (InterruptedException e) { - e.printStackTrace(); + log.error(e); continue; } } } catch (JSONException e) { - e.printStackTrace(); + log.warning(e); } } catch (IOException e) { - e.printStackTrace(); + log.warning(e); } } } @@ -139,6 +139,7 @@ public class UpdatesThread { try { receivedUpdates.wait(); } catch (InterruptedException e) { + log.error(e); continue; } update = receivedUpdates.poll(); diff --git a/src/main/java/org/telegram/updatesreceivers/Webhook.java b/src/main/java/org/telegram/updatesreceivers/Webhook.java index 0902d1e..6f31abc 100644 --- a/src/main/java/org/telegram/updatesreceivers/Webhook.java +++ b/src/main/java/org/telegram/updatesreceivers/Webhook.java @@ -8,6 +8,7 @@ import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.jackson.JacksonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.telegram.BuildVars; +import org.telegram.services.BotLogger; import org.telegram.updateshandlers.UpdatesCallback; import java.io.IOException; @@ -20,6 +21,8 @@ import java.net.URI; * @date 20 of June of 2015 */ public class Webhook { + private static volatile BotLogger log = BotLogger.getLogger(Webhook.class.getName()); + private static final int PORT = 443; private static final String KEYSTORE_SERVER_FILE = "./keystore_server"; private static final String KEYSTORE_SERVER_PWD = "asdfgh"; @@ -48,7 +51,8 @@ public class Webhook { new SSLEngineConfigurator(sslContext).setClientMode(false).setNeedClientAuth(false)); try { grizzlyServer.start(); - } catch (IOException ignored) { + } catch (IOException e) { + log.error(e); } }