Initial app packaging (#12, #14, #15)

* Initial app packaging (WIP)

* Image rename

* Toolchain is Gnu

* Use alternative capabilities: configuration schema

* Install Rust in setup.ps1

* Install step rather than init step

* Fix path

* Fix name of gelfAddress setting

* Output verbose logs from cargo build

* Continue on errors so that cargo output is visible

* Redirect cargo's STDERR

* Write events to STDERR as valid CLEF

* Very simple pygelf example

* Use grayscale Seq logo for package icon

* Publish to NuGet

Seq.Input.Gelf.nuspec

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Seq.Input.Gelf</id>
+    <version>$version$</version>
+    <authors>Datalust and Contributors</authors>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Receive GELF event payloads via UDP.</description>
+    <language>en-US</language>
+    <projectUrl>https://github.com/datalust/sqelf</projectUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
+    <iconUrl>https://raw.githubusercontent.com/datalust/sqelf/master/asset/seq-input-gelf.png</iconUrl>
+    <tags>seq-app</tags>
+  </metadata>
+  <files>
+    <file src="seq-input-gelf.d.json" target="" />
+    <file src="target\x86_64-pc-windows-msvc\release\sqelf.exe" target="win-x64" />
+    <file src="target\x86_64-unknown-linux-gnu\release\sqelf" target="linux-x64\sqelf" />
+  </files>
+</package>

appveyor.yml

@@ -14,8 +14,21 @@ environment:
 init:
   - git config --global core.longpaths true
 
+install:
+- ps: ./ci/setup.ps1
+- ps: $env:Path = "C:\Users\appveyor\.cargo\bin;$env:Path"
+
 build_script:
 - ps: ./ci/build.ps1 -shortver "$($env:APPVEYOR_BUILD_VERSION)"
 
 artifacts:
 - path: publish\*
+
+deploy:
+- provider: NuGet
+  api_key:
+    secure: ksmDWNHXO2Sh0FDXjJ+vj2a6ICn1bc2XQuA3hQ1N26Sel6kOwP/W8Z9u0y6JNQbg
+  skip_symbols: true
+  artifact: /Seq.Input.Gelf.*\.nupkg/
+  on:
+    branch: /^(master|dev|release/.*)$/

ci/build.ps1

@@ -16,7 +16,6 @@ function Write-BeginStep($invocation)
     Write-Output "###########################################################"
     Write-Output ""
 }
-
 function Initialize-Docker
 {
     Write-BeginStep $MYINVOCATION
@@ -29,10 +28,16 @@ function Initialize-Docker
     }
 }
 
-function Initialize-HostShare
+function Initialize-Filesystem
 {
     Write-BeginStep $MYINVOCATION
 
+    if (Test-Path .\publish) {
+        Remove-Item .\publish -Recurse
+    }
+
+    mkdir .\publish
+
     if ($IsCIBuild)
     {
         $hostShare = "X:\host"
@@ -47,7 +52,7 @@ function Initialize-HostShare
     }
 }
 
-function Invoke-NativeBuild
+function Invoke-LinuxBuild
 {
     Write-BeginStep $MYINVOCATION
 
@@ -65,16 +70,39 @@ function Invoke-NativeBuild
     }
 }
 
-function Build-Container
+function Invoke-DockerBuild
 {
     Write-BeginStep $MYINVOCATION
 
     & docker build --file dockerfiles/Dockerfile -t sqelf-ci:latest .
     if ($LASTEXITCODE) { exit 1 }
 }
 
+function Invoke-WindowsBuild
+{
+    Write-BeginStep $MYINVOCATION
+
+    # Cargo writes to STDERR
+    $ErrorActionPreference = "SilentlyContinue"
+
+    cargo build --release --target=x86_64-pc-windows-msvc
+    if ($LASTEXITCODE) { exit 1 }
+
+    $ErrorActionPreference = "Stop"
+}
+
+function Invoke-NuGetPack($version)
+{
+    Write-BeginStep $MYINVOCATION
+
+    & .\tool\nuget.exe pack .\Seq.Input.Gelf.nuspec -version $version -outputdirectory .\publish
+    if ($LASTEXITCODE) { exit 1 }
+}
+
 function Publish-Container($version)
 {
+    Write-BeginStep $MYINVOCATION
+
     & docker tag sqelf-ci:latest datalust/sqelf-ci:$version
     if ($LASTEXITCODE) { exit 1 }
 
@@ -91,15 +119,15 @@ function Publish-Container($version)
 $ErrorActionPreference = "Stop"
 Push-Location "$PSScriptRoot/../"
 
-$version = "$shortver.0"
-
 Initialize-Docker
-Initialize-HostShare
-Invoke-NativeBuild
-Build-Container
+Initialize-Filesystem
+Invoke-LinuxBuild
+Invoke-DockerBuild
+Invoke-WindowsBuild
+Invoke-NuGetPack $shortver
 
 if ($IsPublishedBuild) {
-    Publish-Container $version
+    Publish-Container $shortver
 }
 else {
     Write-Output "Not publishing Docker container"

ci/setup.ps1

@@ -0,0 +1,9 @@
+$ErrorActionPreference = "Stop"
+
+$RequiredRustToolchain = "stable"
+
+Invoke-WebRequest -OutFile ./rustup-init.exe -Uri https://win.rustup.rs
+$ErrorActionPreference = "Continue"
+& ./rustup-init.exe --default-host x86_64-pc-windows-msvc --default-toolchain $RequiredRustToolchain -y
+if ($LASTEXITCODE) { exit 1 }
+$ErrorActionPreference = "Stop"

examples/pygelf-example.py

@@ -0,0 +1,11 @@
+# Example logging with https://github.com/keeprocking/pygelf
+# First, `pip install pygelf`
+
+from pygelf import GelfUdpHandler
+import logging
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger()
+logger.addHandler(GelfUdpHandler(host='127.0.0.1', port=12201))
+
+logger.info('Hello, Seq+GELF!')

seq-input-gelf.d.json

@@ -0,0 +1,22 @@
+{
+    "$schema": "https://getseq.net/schema/app-definition/v3",
+    "name": "GELF Input",
+    "description": "Accept Graylog Extended Log Format (GELF) payloads over UDP. Requires Seq 5.1+ for optimal performance.",
+    "capabilities": ["input"],
+    "platform": {
+      "win-x64": {
+        "executable": "win-x64\\sqelf.exe"
+      },
+      "linux-x64": {
+        "executable": "linux-x64/sqelf"
+      }
+    },
+    "settings": {
+      "gelfAddress": {
+        "displayName": "GELF address",
+        "helpText": "The socket address (IP address and port) on which the input will listen for UDP GELF payloads. The default is `0.0.0.0:12201`.",
+        "isOptional": true
+      }
+    }
+  }
+

sqelf/Cargo.toml

@@ -40,3 +40,7 @@ version = "1"
 
 [dependencies.failure]
 version = "0.1"
+
+[dependencies.chrono]
+version = "0.4"
+features = ["serde"]

sqelf/src/diagnostics.rs

@@ -0,0 +1,35 @@
+use chrono::{DateTime, Utc};
+use std::fmt::Display;
+
+#[derive(Serialize)]
+struct DiagnosticEvent<'a> {
+    #[serde(rename="@t")]
+    timestamp: DateTime<Utc>,
+
+    #[serde(rename="@l")]
+    level: &'static str,
+
+    #[serde(rename="@mt")]
+    message_template: &'static str,
+
+    #[serde(rename="@x")]
+    error: Option<&'a str>,
+}
+
+impl<'a> DiagnosticEvent<'a> {
+    pub fn new(level: &'static str, error: Option<&'a str>, message_template: &'static str) -> DiagnosticEvent<'a> {
+        DiagnosticEvent {
+            timestamp: Utc::now(),
+            message_template,
+            level,
+            error,
+        }
+    }
+}
+
+pub fn emit_err(error: &impl Display, message_template: &'static str) {
+    let err_str = format!("{}", error);
+    let evt = DiagnosticEvent::new("ERROR", Some(&err_str), &message_template);
+    let json = serde_json::to_string(&evt).expect("infallible JSON");
+    eprintln!("{}", json);
+}

sqelf/src/main.rs

@@ -5,6 +5,7 @@ pub mod io;
 pub mod process;
 pub mod receive;
 pub mod server;
+mod diagnostics;
 
 use std::error;
 
@@ -24,7 +25,6 @@ impl Config {
 
 fn main() -> Result<(), Box<error::Error>> {
     let config = Config::get();
-    eprintln!("{:#?}", config);
 
     // The receiver for GELF messages
     let receive = {