Fix arq example code after review

Author: guuskuiper

examples/Arq/LibStored.Arq/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.5)
+cmake_policy(VERSION 3.5)
 project(arq)
 
+set(CMAKE_INSTALL_PREFIX /app)
+
 # Point to the directory where you have cloned libstored.
 set(LIBSTORED_CLONE ${PROJECT_SOURCE_DIR}/../extern/libstored)
 list(APPEND CMAKE_MODULE_PATH ${LIBSTORED_CLONE}/cmake)
@@ -14,7 +17,7 @@ message(STATUS "Using libstored destination from ${LIBSTORED_GENERATE_DESTINATIO
 # Add ZMQ
 list(APPEND CMAKE_MODULE_PATH ${LIBSTORED_CLONE}/dist/common)
 find_package(ZeroMQ REQUIRED)
-set(LIBSTORED_HAVE_LIBZMQ ON)
+set(LIBSTORED_HAVE_LIBZMQ ON CACHE BOOL "" FORCE)
 
 # Include libstored functions
 include(libstored)

examples/Arq/LibStored.Arq/Dockerfile

@@ -58,8 +58,8 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Copy the examples
-COPY --from=builder /src/app/build/arq /app/
+COPY --from=builder /app /app
 
-WORKDIR /app
+WORKDIR /app/bin
 
 CMD ["./arq"]

examples/Arq/LibStored.Arq/build.sh

@@ -3,5 +3,6 @@ cd build
 cmake ..
 cmake --build .
 # Regenerate CMake after code generation
-cmake ..
-cmake --build . --target install
+#cmake ..
+cmake --build . --target install
+# CMAKE INSTALL PREFIX

examples/Arq/LibStored.Net.Arq.Console/Program.cs

@@ -63,13 +63,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         synchronizer.Map(syncStore);
 
         ILogger storeLogger = _loggerFactory.CreateLogger(nameof(ArqStore));
-        bool storeInitialized = false;
         store.PropertyChanged += (_, args) =>
         {
-            if (!storeInitialized && args.PropertyName == nameof(ArqStore.Ber))
-            {
-                storeInitialized = true;
-            }
             string value = args.PropertyName switch
             {
                 nameof(ArqStore.Ber) => store.Ber.ToString(CultureInfo.InvariantCulture),
@@ -91,6 +86,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         ProtocolBuilder.ProtocolStack syncStack = ProtocolBuilder.Create(_services)
             .Add(synchronizer)
+            .Add<BufferLayer>()
             .Add<SegmentationLayer>()
             .Add<LoggerLayer>()
             .Add<ArqLayer>()
@@ -111,7 +107,6 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         ArqLayer arqLayer = (ArqLayer)syncStack.Layers.First(x => x is ArqLayer);
         bool connected = false;
-        bool initialConnect = false;
         arqLayer.EventOccurred += (_, e) =>
         {
             _logger.LogInformation("Arc Event: {Event}", e.Event);
@@ -125,43 +120,29 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             }
         };
 
-        // First make sure the connection is established before calling syncFrom.
-        // Otherwise, many reset commands send before the first ACK replay is received, causing resetting back-and-forth.
-        arqLayer.KeepAlive();
+        synchronizer.SyncFrom(syncStore, syncLayer);
 
-        int retryIn = 3;
         NetMQTimer syncTimer = new(TimeSpan.FromMilliseconds(1000));
-        using (NetMQPoller poller = [syncTimer, socket])
+        NetMQTimer keepAliveTimer = new(TimeSpan.FromMilliseconds(5000));
+        using (NetMQPoller poller = [syncTimer, keepAliveTimer, socket])
         {
             socket.ReceiveReady += (_, _) =>
             {
                 int bytesReceived = syncZmqLayer.ReceiveAll();
                 _logger.LogTrace("Sync Received {Bytes} bytes", bytesReceived);
             };
 
-            syncTimer.Elapsed += (_, _) =>
+            keepAliveTimer.Elapsed += (_, _) =>
             {
-                if (connected && !initialConnect)
-                {
-                    // First time after connected, enable synchronisation for the store.
-                    synchronizer.SyncFrom(syncStore, syncLayer);
-                    initialConnect = true;
-                }
+                arqLayer.KeepAlive();
+            };
 
+            syncTimer.Elapsed += (_, _) =>
+            {
                 if (connected)
                 {
                     store.Hello += 1;
                 }
-                else
-                {
-                    retryIn--;
-                    if(retryIn <= 0)
-                    {
-                        _logger.LogInformation("Not connected yet, sending keep-alive");
-                        arqLayer.KeepAlive();
-                        retryIn = 3;
-                    }
-                }
                 synchronizer.Process();
             };