upgrade java wrapper to 3.5.22 and support os x

goodluckwgw · Nov 29, 2013 · 0ffc158 · 0ffc158
1 parent 19af388
commit 0ffc158
Show file tree

Hide file tree

Showing 17 changed files with 233 additions and 111 deletions.
diff --git a/LICENSE b/LICENSE
@@ -226,4 +226,18 @@ JOPT-SIMPLE LICENSE
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ -----------------------------------------------------------------------
+
+ Tanuki Software, Ltd. 
+ Community Software License Agreement
+ Version 1.1
+
+IMPORTANT-READ CAREFULLY: This license agreement is a legal agreement
+between you ("Licensee") and Tanuki Software, Ltd. ("TSI"), which
+includes computer software, associated media, printed materials, and
+may include online or electronic documentation ( Software ). PLEASE
+READ THIS AGREEMENT CAREFULLY BEFORE YOU INSTALL, COPY, DOWNLOAD OR
+USE THE SOFTWARE ACCOMPANYING THIS PACKAGE.
diff --git a/bin/jafka b/bin/jafka
diff --git a/bin/jafka-linux-x86-32 b/bin/jafka-linux-x86-32
diff --git a/bin/jafka-linux-x86-64 b/bin/jafka-linux-x86-64
diff --git a/bin/jafka-macosx-universal-32 b/bin/jafka-macosx-universal-32
diff --git a/bin/jafka-macosx-universal-64 b/bin/jafka-macosx-universal-64
diff --git a/bin/jafka-windows-x86-32.exe b/bin/jafka-windows-x86-32.exe
diff --git a/bin/jafka.exe b/bin/jafka.exe
diff --git a/bin/jafka64 b/bin/jafka64
diff --git a/bin/optional/libwrapper-linux-x86-32.so b/bin/optional/libwrapper-linux-x86-32.so
diff --git a/bin/optional/libwrapper-linux-x86-64.so b/bin/optional/libwrapper-linux-x86-64.so
diff --git a/bin/optional/libwrapper-macosx-universal-32.jnilib b/bin/optional/libwrapper-macosx-universal-32.jnilib
diff --git a/bin/optional/libwrapper-macosx-universal-64.jnilib b/bin/optional/libwrapper-macosx-universal-64.jnilib
diff --git a/bin/optional/wrapper-windows-x86-32.dll b/bin/optional/wrapper-windows-x86-32.dll
diff --git a/bin/optional/wrapper.jar b/bin/optional/wrapper.jar
diff --git a/bin/run.sh b/bin/run.sh
diff --git a/src/main/java/com/sohu/jafka/network/Processor.java b/src/main/java/com/sohu/jafka/network/Processor.java
@@ -108,11 +108,11 @@ public void run() {
  close(key);
  } catch (Throwable t) {
  Socket socket = channelFor(key).socket();
- final String msg = "Closing socket for %s:%d becaulse of error";
+ final String msg = "Closing socket for %s:%d becaulse of error %s";
  if (logger.isDebugEnabled()) {
- logger.error(format(msg, socket.getInetAddress(), socket.getPort()), t);
+ logger.error(format(msg, socket.getInetAddress(), socket.getPort(), t.getMessage()), t);
  } else {
- logger.error(format(msg, socket.getInetAddress(), socket.getPort()));
+ logger.info(format(msg, socket.getInetAddress(), socket.getPort(), t.getMessage()));
  }
  close(key);
  }