* Added ConsistencyLevel enum to Timber protobuffer definition.

log/src/main/java/org/cloudname/log/Converter.java

@@ -1,6 +1,7 @@
 package org.cloudname.log;
 
 import org.cloudname.log.pb.Timber;
+import static org.cloudname.log.pb.Timber.ConsistencyLevel;
 
 import com.google.protobuf.ByteString;
 
@@ -55,6 +56,7 @@ public Converter(String serviceName) {
     public Timber.LogEvent convertFrom(LogRecord rec) {
         Timber.LogEvent.Builder eventBuilder =  Timber.LogEvent.newBuilder()
             .setTimestamp(rec.getMillis())
+            .setConsistencyLevel(ConsistencyLevel.BESTEFFORT)
             .setLevel(rec.getLevel().intValue())
             .setHost(hostName)
             .setServiceName(serviceName)

log/src/main/java/org/cloudname/log/LogUtil.java

@@ -1,6 +1,7 @@
 package org.cloudname.log;
 
 import org.cloudname.log.pb.Timber;
+import static org.cloudname.log.pb.Timber.ConsistencyLevel;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -41,6 +42,7 @@ public static Timber.LogEvent textEvent(int level,
     {
         return Timber.LogEvent.newBuilder()
             .setTimestamp(System.currentTimeMillis())
+            .setConsistencyLevel(ConsistencyLevel.BESTEFFORT)
             .setLevel(level)
             .setHost(hostName)
             .setServiceName(service)

log/src/main/protobuf/timber.proto

@@ -5,6 +5,22 @@
 option java_package = "org.cloudname.log.pb";
 option optimize_for = SPEED;
 
+// Consistency levels indicating how we want the log message
+// to be handled by the logging infrastructure.
+enum ConsistencyLevel {
+  // Best effort.  Prioritize speed over consistency.
+  BESTEFFORT = 0;
+
+  // At least guarantee that the log message is synced to local disk
+  // before returning from calls or assuming responsibility for the
+  // log message.
+  SYNC = 1;
+
+  // Require that the log message is not only persisted locally, but
+  // also replicated so it exists in more than one place.
+  REPLICATED = 2;
+}
+
 // This message represents the envelope of a log message.  These are
 // the only fields that the core log server framework should deal with
 // minus the payload.  In the interest of simplicity and performance
@@ -15,35 +31,41 @@ option optimize_for = SPEED;
 message LogEvent {
   // Timestamp is in milliseconds since epoch
   required int64 timestamp = 1;
+
+  // The required consistency level of the log message
+  required ConsistencyLevel consistencyLevel = 2 [default = BESTEFFORT];
 
   // The level of this event.
-  required int32 level = 2;
+  required int32 level = 3;
 
   // Hostname of the machine where the log event originated.
-  required string host = 3;
+  required string host = 4;
 
   // The name of the service or the application that emitted the
   // event.  If used in conjunction with cloudname this is where
   // we put the primary service coordinate.
-  required string service_name = 4;
+  required string service_name = 5;
 
   // For Java programs the class and method where the log event
   // originated.
-  required string source = 5;
+  required string source = 6;
 
   // The type of log event.
-  required string type = 6;
+  required string type = 7;
 
   // Zero or more payloads associated with this log event.
-  repeated Payload payload = 7;
+  repeated Payload payload = 8;
 
   // The process id of the originating program.  If unknown this
   // defaults to zero.
-  optional int32 pid = 8 [default = 0];
+  optional int32 pid = 9 [default = 0];
 
   // The thread id of the originating program.  If unknown this
   // defaults to zero.
-  optional int32 tid = 9 [default = 0];
+  optional int32 tid = 10 [default = 0];
+
+  // Optional id of log message
+  optional string id = 11;
 }
 
 // This message represents the payload of a log message.

log/src/test/java/org/cloudname/log/archiver/SlotTest.java

@@ -1,6 +1,7 @@
 package org.cloudname.log.archiver;
 
 import org.cloudname.log.pb.Timber;
+import static org.cloudname.log.pb.Timber.ConsistencyLevel;
 import org.cloudname.log.recordstore.RecordReader;
 
 import com.google.protobuf.ByteString;
@@ -31,6 +32,7 @@ private Timber.LogEvent makeLogEvent(long time)
     {
         return Timber.LogEvent.newBuilder()
             .setTimestamp(time)
+            .setConsistencyLevel(ConsistencyLevel.BESTEFFORT)
             .setLevel(1)
             .setHost("example.com")
             .setServiceName("myservice")

log/src/test/java/org/cloudname/log/recordstore/RecordWriterTest.java

@@ -1,6 +1,8 @@
 package org.cloudname.log.recordstore;
 
 import org.cloudname.log.pb.Timber;
+import static org.cloudname.log.pb.Timber.ConsistencyLevel;
+
 import com.google.protobuf.ByteString;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
@@ -24,6 +26,7 @@ public class RecordWriterTest {
     public static Timber.LogEvent createMessage(String message) {
         return Timber.LogEvent.newBuilder()
             .setTimestamp(1000000)
+            .setConsistencyLevel(ConsistencyLevel.BESTEFFORT)
             .setLevel(1)
             .setHost("example.com")
             .setServiceName("myservice")

timber/src/test/java/org/cloudname/timber/server/DispatcherTest.java

@@ -1,6 +1,7 @@
 package org.cloudname.timber.server;
 
 import org.cloudname.log.pb.Timber;
+import static org.cloudname.log.pb.Timber.ConsistencyLevel;
 
 import org.cloudname.timber.server.handler.LogEventHandler;
 import org.cloudname.timber.server.handler.LogEventHandlerException;
@@ -46,6 +47,7 @@ public void handle(Timber.LogEvent logEvent)
     public static Timber.LogEvent createMessage(String message) {
         return Timber.LogEvent.newBuilder()
             .setTimestamp(System.currentTimeMillis())
+            .setConsistencyLevel(ConsistencyLevel.BESTEFFORT)
             .setLevel(1)
             .setHost("example.com")
             .setServiceName("myservice")