[vlma-devel] commit: Log messages translation. (Adrien Grand )

git version control git at videolan.org
Fri Apr 25 23:03:19 CEST 2008


vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Fri Apr 25 22:55:23 2008 +0200| [65e47d1a1c8a18d34f2bbad7f46eb6351bdb750a]

Log messages translation.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=65e47d1a1c8a18d34f2bbad7f46eb6351bdb750a
---

 .../org/videolan/vlma/daemon/VlExtremeWatcher.java |   24 ++++++++++----------
 .../videolan/vlma/daemon/VlOrderMonitoring.java    |    2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/daemon/src/main/java/org/videolan/vlma/daemon/VlExtremeWatcher.java b/daemon/src/main/java/org/videolan/vlma/daemon/VlExtremeWatcher.java
index 0521fc2..854b214 100644
--- a/daemon/src/main/java/org/videolan/vlma/daemon/VlExtremeWatcher.java
+++ b/daemon/src/main/java/org/videolan/vlma/daemon/VlExtremeWatcher.java
@@ -84,17 +84,17 @@ public class VlExtremeWatcher implements IVlStreamWatcher {
     
     public Map<InetAddress, InetAddress> getStreams() {
         String toParse = "";
-        // Connexion au routeur en telnet
-        logger.log(Level.DEBUG, "Connexion au routeur pour récupération de l'état de flux");
+        // Connect to the router
+        logger.log(Level.DEBUG, "Connect to the router to get the stream state.");
         try {
-            // Création du socket et connexion
+            // Create socket and connection
             Socket socket = new Socket(ROUTER_HOST, ROUTER_PORT);
             PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
             BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            // Envoi du login et du mot de passe
+            // Print login and password
             out.println(ROUTER_USER);
             out.println(ROUTER_PASSWORD);
-            // Envoi de la commande et réception du résultat
+            // Send command and get response
             out.println("show igmp snooping " + ROUTER_VLAN);
             out.println("          ");
             Thread.sleep(TELNET_DEFAULT_WAIT);
@@ -105,19 +105,19 @@ public class VlExtremeWatcher implements IVlStreamWatcher {
             while (in.ready()) {
                 toParse += (char) in.read();
             }
-            // Fermeture de la connexion
+            // Close connection
             out.close();
             in.close();
             socket.close();
         } catch (UnknownHostException e) {
-            logger.log(Level.ERROR, "Erreur lors de l'interrogation du routeur", e);
+            logger.log(Level.ERROR, "Error while querying the router.", e);
         } catch (IOException e) {
-            logger.log(Level.ERROR, "Erreur lors de l'interrogation du routeur", e);
+            logger.log(Level.ERROR, "Error while querying the router.", e);
         } catch (InterruptedException e) {
-            logger.log(Level.ERROR, "Le thread a été interrompu", e);
+            logger.log(Level.ERROR, "Thread has been interrupted.", e);
         }
 
-        // Parsing des données du routeur
+        // Parse data
         HashMap<InetAddress, InetAddress> streams = new HashMap<InetAddress, InetAddress>();
         Matcher m = Pattern.compile("\\s+\\w+\\s+(\\d+\\.\\d+\\.\\d+\\.\\d+)\\s+(\\d+\\.\\d+\\.\\d+\\.\\d+)").matcher(toParse);
         while (m.find()) {
@@ -126,10 +126,10 @@ public class VlExtremeWatcher implements IVlStreamWatcher {
                 InetAddress ip2 = InetAddress.getByName(m.group(2));
                 if ((ip1.isMulticastAddress()) && (!ip2.isMulticastAddress())) {
                     streams.put(ip1, ip2);
-                    logger.log(Level.DEBUG, "Le serveur " + ip2.getHostName() + " diffuse " + ip1.getHostName());
+                    logger.log(Level.DEBUG, "Server " + ip2.getHostName() + " streams " + ip1.getHostName());
                 }
             } catch (UnknownHostException e) {
-                logger.log(Level.ERROR, "Impossible de résoudre une adresse", e);
+                logger.log(Level.ERROR, "Name resolution error.", e);
             }
         }
         return streams;
diff --git a/daemon/src/main/java/org/videolan/vlma/daemon/VlOrderMonitoring.java b/daemon/src/main/java/org/videolan/vlma/daemon/VlOrderMonitoring.java
index 58473aa..3554f2b 100644
--- a/daemon/src/main/java/org/videolan/vlma/daemon/VlOrderMonitoring.java
+++ b/daemon/src/main/java/org/videolan/vlma/daemon/VlOrderMonitoring.java
@@ -200,7 +200,7 @@ public class VlOrderMonitoring {
             orderMonitorDaemonThread.setName("OrderMonitorDaemonThread");
             orderMonitorDaemonThread.start();
         }
-    };
+    }
 
 
     private Runnable commandCleanerDaemon = new Runnable() {



More information about the vlma-devel mailing list