journald-native 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434d6c7409f38d0c734102b165c7422774b4b765
-  data.tar.gz: dbb1a39c162a253430a5ddf497a7b6ecc8c71ee5
+  metadata.gz: 40cc80f310e9a40ca958130fae646a2498d50876
+  data.tar.gz: 742cc24381ddf5eaddba2baf430ef332f6030a2e
 SHA512:
-  metadata.gz: 53b67e58815b34992d37b8a39339372e2d27393bbefe533d37375aac7fd4ef9386fd35fecece27ee7c9b201f56488d12fed26d22d24a1b17bb00e72fdad67473
-  data.tar.gz: ec9ac27fa92aeb99b0258780342ebdbf34805f90db345990f5e650db5bf9a4ffd8e738f8a64612b7612a03bd4f540ab8091a4a74e8635b234f5caec24d503f68
+  metadata.gz: 6a0254aae671f1b71835ccb8ae0a22fed7827ad195643f1192dc930587b2c906723ecc2254d9c7fb59229a39ba8566b5039dbe1c04a6349e34170ec602109936
+  data.tar.gz: 3eaf04c61e3a201c86a430c03abed4da16ec7daccfc9c6d90e9b0c22ce1fbee34ba3c2d3d4758f4f23762eeaa93b6fb0d21b4e655f8fe7b11f289569c36b8b81

data/.gitignore

@@ -25,3 +25,4 @@ Makefile
 *.ipr
 *.iws
 .rakeTasks
+.idea

data/README.md

@@ -1,12 +1,14 @@
 # journald-native
 
+[![Gem Version](https://badge.fury.io/rb/journald-native.svg)](http://badge.fury.io/rb/journald-native)
+
 A systemd-journal native logging lib wrapper.
 [See sd-journal help for more info](http://www.freedesktop.org/software/systemd/man/sd_journal_print.html)
 
 ## Usage
 
 ```ruby
-    require 'journald/native'
+require 'journald/native'
 ```
 
 ### Constants
@@ -16,14 +18,14 @@ Constants are used to denote a log level
 Available constants:
 
 ```ruby
-    Journald::LOG_EMERG     # system is unusable
-    Journald::LOG_ALERT     # action must be taken immediately
-    Journald::LOG_CRIT      # critical conditions
-    Journald::LOG_ERR       # error conditions
-    Journald::LOG_WARNING   # warning conditions
-    Journald::LOG_NOTICE    # normal but significant condition
-    Journald::LOG_INFO      # informational
-    Journald::LOG_DEBUG     # debug-level messages
+Journald::LOG_EMERG     # system is unusable
+Journald::LOG_ALERT     # action must be taken immediately
+Journald::LOG_CRIT      # critical conditions
+Journald::LOG_ERR       # error conditions
+Journald::LOG_WARNING   # warning conditions
+Journald::LOG_NOTICE    # normal but significant condition
+Journald::LOG_INFO      # informational
+Journald::LOG_DEBUG     # debug-level messages
 ```
 
 systemd-journal uses syslog constants to denote level therefore they are equal to those of the Syslog module,
@@ -36,14 +38,14 @@ Methods of Journald::Native class wrap systemd-journal calls.
 [See sd-journal help for more info](http://www.freedesktop.org/software/systemd/man/sd_journal_print.html) 
 
 ```ruby
-    Journald::Native.send "MESSAGE=message", "PRIORITY=#{Journald::LOG_WARNING}"
-    Journald::Native.print Journald::LOG_WARNING, "message"
-    Journald::Native.perror "message"
+Journald::Native.send "MESSAGE=message", "PRIORITY=#{Journald::LOG_WARNING}"
+Journald::Native.print Journald::LOG_WARNING, "message"
+Journald::Native.perror "message"
 ```
 
 It is not recommended to use ```print``` and ```perror``` as you may lose ```'\0'``` byte in your string due to
 C zero-terminated string format (all zero bytes in the middle will be removed) On the contrary ```send``` uses
-binary buffers and does not have such shortcoming.
+binary buffers and does not have this shortcoming.
 
 ### License
 

data/ext/journald_native/journald_native.c

@@ -51,7 +51,7 @@ static void jdl_init_constants()
 static void jdl_init_methods()
 {
     rb_define_singleton_method(mNative, "print",  jdl_native_print,  2);
-    rb_define_singleton_method(mNative, "send",   jdl_native_send,  -1); // -1 to pass as C array
+    rb_define_singleton_method(mNative, "send",   jdl_native_send,  -1); /* -1 to pass as C array */
     rb_define_singleton_method(mNative, "perror", jdl_native_perror, 1);
 }
 
@@ -72,16 +72,20 @@ static VALUE jdl_native_print(VALUE v_self, VALUE v_priority, VALUE v_message)
 
 static VALUE jdl_native_send(int argc, VALUE* argv, VALUE self)
 {
-    //const char * fmt = "%s";
     struct iovec *msgs;
     size_t i;
     int result;
 
+    /* first check everything is a string / convertable to string */
+    for (i = 0; i < argc; i++) {
+        StringValue(argv[i]); /* you may get a ruby exception here */
+    }
+
+    /* allocate memory after all checks to avoid possible memory leak */
     msgs = calloc(argc, sizeof(struct iovec));
 
     for (i = 0; i < argc; i++) {
         VALUE v = argv[i];
-        StringValue(v);
         msgs[i].iov_base = RSTRING_PTR(v);
         msgs[i].iov_len  = RSTRING_LEN(v);
     }
@@ -119,7 +123,7 @@ static char * jdl_alloc_safe_string(VALUE v_string)
           *ptr;
     size_t i;
 
-    /* convert tos sring */
+    /* convert to string */
     StringValue(v_string);
 
     str = RSTRING_PTR(v_string);

data/lib/journald/native/version.rb

@@ -1,5 +1,5 @@
 module Journald
   module Native
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: journald-native
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Anton Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler