Merge pull request #714 from integer32llc/timeout-metrics

Author: shepmaster

deployment/update.sh

@@ -3,13 +3,20 @@
 set -euv -o pipefail
 
 root=/home/ubuntu
+binary_path=$root/playground-artifacts/ui
 
 # Get new docker images
 $root/rust-playground/compiler/fetch.sh
 
 # Clean old docker images
 docker system prune -f || true
 
+# Get the binary's hash so we know if it has changed
+previous_binary_hash=""
+if [[ -f "${binary_path}" ]]; then
+    previous_binary_hash=$(md5sum "${binary_path}")
+fi
+
 # Get new artifacts
 aws s3 sync --region=us-east-2 s3://playground-artifacts-i32 $root/playground-artifacts
 # These artifacts don't change names and might stay the same size
@@ -23,8 +30,10 @@ aws s3 sync \
     --include=build/robots.txt \
     --exact-timestamps \
     s3://playground-artifacts-i32 $root/playground-artifacts
-chmod +x $root/playground-artifacts/ui
+chmod +x "${binary_path}"
 
 # Restart to get new server binary
-sudo service playground stop || true
-sudo service playground start
+if [[ -z "${previous_binary_hash}" ]] || ! md5sum -c <(echo "${previous_binary_hash}") --status; then
+    sudo service playground stop || true
+    sudo service playground start
+fi

tests/Gemfile.lock

@@ -18,9 +18,9 @@ GEM
     diff-lcs (1.4.4)
     launchy (2.5.0)
       addressable (~> 2.7)
-    mini_mime (1.0.3)
-    mini_portile2 (2.5.0)
-    nokogiri (1.11.2)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     public_suffix (4.0.6)

tests/spec/features/compilation_targets_spec.rb

@@ -90,8 +90,7 @@
     in_build_menu { click_on("MIR") }
 
     within(:output, :result) do
-      expect(page).to have_content 'StorageLive'
-      expect(page).to have_content 'StorageDead'
+      expect(page).to have_content 'bb0: {'
     end
   end
 

ui/Cargo.lock

@@ -29,6 +29,8 @@ router = "0.6.0"
 openssl-probe = "0.1.2"
 dotenv = "0.15.0"
 snafu = "0.6.0"
+prometheus = "0.12.0"
+strum = { version = "0.20.0", features = ["derive"] }
 
 [dependencies.playground-middleware]
 git = "https://github.com/integer32llc/playground-middleware"

ui/Cargo.toml

@@ -6,15 +6,16 @@ disk in this directory.
 In production, these should be set according to your deployment method
 of choice.
 
-| Key                       | Required | Default Value   | Description                                                             |
-| --------------------------|----------|-----------------|-------------------------------------------------------------------------|
-| `PLAYGROUND_UI_ROOT`      | **Yes**  |                 | The path to the HTML, CSS, and Javascript files                         |
-| `PLAYGROUND_GITHUB_TOKEN` | **Yes**  |                 | The [GitHub API token][gist] to read and write Gists                    |
-| `PLAYGROUND_UI_ADDRESS`   | No       |       127.0.0.1 | The address to listen on                                                |
-| `PLAYGROUND_UI_PORT`      | No       |            5000 | The port to listen on                                                   |
-| `PLAYGROUND_LOG_FILE`     | No       |  access-log.csv | The file to record accesses                                             |
-| `PLAYGROUND_CORS_ENABLED` | No       |                 | If set, will enable CORS support                                        |
-| `TMPDIR`                  | No       | system-provided | Where compilation artifacts will be saved. Must be accessible to Docker |
+| Key                        | Required   | Default Value     | Description                                                               |
+| -------------------------- | ---------- | ----------------- | ------------------------------------------------------------------------- |
+| `PLAYGROUND_UI_ROOT`       | **Yes**    |                   | The path to the HTML, CSS, and Javascript files                           |
+| `PLAYGROUND_GITHUB_TOKEN`  | **Yes**    |                   | The [GitHub API token][gist] to read and write Gists                      |
+| `PLAYGROUND_UI_ADDRESS`    | No         | 127.0.0.1         | The address to listen on                                                  |
+| `PLAYGROUND_UI_PORT`       | No         | 5000              | The port to listen on                                                     |
+| `PLAYGROUND_LOG_FILE`      | No         | access-log.csv    | The file to record accesses                                               |
+| `PLAYGROUND_METRICS_TOKEN` | No         |                   | If set, will require authentication for the metrics endpoint              |
+| `PLAYGROUND_CORS_ENABLED`  | No         |                   | If set, will enable CORS support                                          |
+| `TMPDIR`                   | No         | system-provided   | Where compilation artifacts will be saved. Must be accessible to Docker   |
 
 [dotenv]: https://crates.io/crates/dotenv
 [gist]: https://developer.github.com/v3/gists/#authentication