Merge branch 'main' of github.com:bytebeamio/uplink into vilayat/task…

…/graceful-shutdown

.github/workflows/release.yml

@@ -4,6 +4,33 @@ on:
     types: [published]
 
 jobs:
+  release-tools:
+    name: Build tools/${{ matrix.build }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        build: [system-stats]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+          target: x86_64-unknown-linux-musl
+
+      - name: Build binary
+        working-directory: tools/${{ matrix.build }}
+        run: cargo build --verbose --release
+
+      - name: Upload release archive
+        uses: softprops/action-gh-release@v1
+        with:
+          files: tools/${{ matrix.build }}/target/release/${{ matrix.build }}
+
   build-release:
     name: Build release for ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
@@ -105,6 +132,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: uplink*
+
   build-release-android:
     name: Build release for android
     runs-on: ubuntu-latest

Cargo.toml

@@ -11,6 +11,7 @@ members = [
 exclude = [
     "tools/deserialize-backup",
     "tools/simulator",
+    "tools/system-stats",
     "tools/tunshell",
 ]
 

simulator.sh

@@ -83,7 +83,7 @@ download_auth_config() {
     echo "Downloading config: $url"
     mkdir -p devices
     curl --location $url \
-        --header 'x-bytebeam-tenant: demo' \
+        --header "x-bytebeam-tenant: $BYTEBEAM_TENANT_ID" \
         --header "x-bytebeam-api-key: $BYTEBEAM_API_KEY" > devices/device_$id.json
 }
 

storage/src/lib.rs

@@ -16,6 +16,8 @@ pub enum Error {
     NotBackup,
     #[error("Corrupted backup file")]
     CorruptedFile,
+    #[error("Empty write buffer")]
+    NoWrites,
 }
 
 pub struct Storage {
@@ -92,6 +94,14 @@ impl Storage {
             return Ok(None);
         }
 
+        self.flush()
+    }
+
+    /// Force flush the contents of write buffer onto disk
+    pub fn flush(&mut self) -> Result<Option<u64>, Error> {
+        if self.current_write_file.is_empty() {
+            return Err(Error::NoWrites);
+        }
         match &mut self.persistence {
             Some(persistence) => {
                 let NextFile { mut file, deleted } = persistence.open_next_write_file()?;