Merge master

.gitignore

@@ -3,3 +3,4 @@
 .idea
 
 /publish
+*.orig

ci/build-deps.ps1

@@ -57,14 +57,14 @@ function Invoke-LinuxBuild
 
     if ($IsCIBuild) {
         $hostShare = "X:\host"
-        pushd "$hostShare/src"
+        Push-Location "$hostShare/src"
     }
 
     & "./ci/cross-build.ps1" 2>&1
     if ($LASTEXITCODE) { exit 1 }
 
     if ($IsCIBuild) {
-        popd
+        Pop-Location
         Copy-Item -Path "$hostShare/src/target" -Recurse -Destination . -Container
     }
 }
@@ -113,4 +113,125 @@ function Publish-Container($version)
 
     & docker push datalust/sqelf-ci:$version
     if ($LASTEXITCODE) { exit 1 }
+}
+
+function Start-SeqEnvironment {
+    Write-BeginStep $MYINVOCATION
+
+    Push-Location ci/smoke-test
+
+    $ErrorActionPreference = "SilentlyContinue"
+
+    & docker rm -f sqelf-test-seq | Out-Null
+    & docker rm -f sqelf-test-sqelf | Out-Null
+
+    & docker network rm sqelf-test | Out-Null
+
+    & docker network create sqelf-test
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    & docker pull datalust/seq:latest
+    & docker run --name sqelf-test-seq `
+        --network sqelf-test `
+        -e ACCEPT_EULA=Y `
+        -itd `
+        -p 5342:80 `
+        datalust/seq:latest
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    & docker run --name sqelf-test-sqelf `
+        --network sqelf-test `
+        -e SEQ_ADDRESS=http://sqelf-test-seq:5341 `
+        -itd `
+        -p 12202:12201/udp `
+        sqelf-ci:latest
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    # Give Seq enough time to start up
+    Start-Sleep -Seconds 5
+
+    $ErrorActionPreference = "Stop"
+
+    Pop-Location
+}
+
+function Stop-SeqEnvironment {
+    Write-BeginStep $MYINVOCATION
+
+    Push-Location ci/smoke-test
+
+    & docker rm -f sqelf-test-seq
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    & docker rm -f sqelf-test-sqelf
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    & docker network rm sqelf-test
+    if ($LASTEXITCODE) {
+        Pop-Location
+        exit 1
+    }
+
+    Pop-Location
+}
+
+function Build-TestAppContainer {
+    Write-BeginStep $MYINVOCATION
+
+    & docker build --file ci/smoke-test/app/Dockerfile -t sqelf-app-test:latest .
+    if ($LASTEXITCODE) { exit 1 }
+}
+
+function Invoke-TestApp {
+    Write-BeginStep $MYINVOCATION
+
+    & docker run `
+        --rm `
+        -it `
+        --log-driver gelf `
+        --log-opt gelf-address=udp://localhost:12202 `
+        sqelf-app-test:latest
+    if ($LASTEXITCODE) { exit 1 }
+
+    # Give sqelf enough time to batch and send
+    Start-Sleep -Seconds 2
+}
+
+function Check-ClefOutput {
+    Write-BeginStep $MYINVOCATION
+
+    $json = Invoke-RestMethod -Uri http://localhost:5342/api/events?clef
+
+    if (-Not $json) {
+        throw [System.Exception] "CLEF output is empty"
+    } else {
+        $json
+    }
+}
+
+function Check-SqelfLogs {
+    Write-BeginStep $MYINVOCATION
+
+    & docker logs sqelf-test-sqelf
+}
+
+function Check-SeqLogs {
+    Write-BeginStep $MYINVOCATION
+
+    & docker logs sqelf-test-seq
 }

ci/build.ps1

@@ -11,8 +11,22 @@ Initialize-Docker
 Initialize-Filesystem
 Invoke-LinuxBuild
 Invoke-DockerBuild
-Invoke-WindowsBuild
-Invoke-NuGetPack $shortver
+
+if ($IsWindows) {
+    Invoke-WindowsBuild
+    Invoke-NuGetPack $shortver
+}
+else {
+    Write-Output "Not running Windows build"
+}
+
+Build-TestAppContainer
+Start-SeqEnvironment
+Invoke-TestApp
+Check-SqelfLogs
+Check-SeqLogs
+Check-ClefOutput
+Stop-SeqEnvironment
 
 if ($IsPublishedBuild) {
     Publish-Container $shortver

sqelf/Cargo.toml

@@ -11,6 +11,9 @@ version = "0.1"
 [dependencies.tokio]
 version = "0.1"
 
+[dependencies.tokio-signal]
+version = "0.2"
+
 [dependencies.bytes]
 version = "0.4"