Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/infra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 50bceae68338
Choose a base ref
...
head repository: NixOS/infra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da62f520b8fd
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 11, 2020

  1. add timeout to channel exporter requests 

    According to the requests documentation there's no default timeout
whatsoever, which means the update loop can get stuck.

    If no timeout is specified explicitly, requests do not time out.
    @LnL7
    LnL7 committed Jun 11, 2020
    Copy the full SHA
    6e40e7b View commit details

  2. enable logging for the channel exporter

    @LnL7
    LnL7 committed Jun 11, 2020
    Copy the full SHA
    721f0f7 View commit details

Commits on Jun 17, 2020

  1. Merge pull request #116 from LnL7/channel-exporter-timeout 

    add timeout to channel exporter requests
    @grahamc
    grahamc authored Jun 17, 2020
    Copy the full SHA
    da62f52 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 delft/eris/channel-exporter.py
4 changes: 3 additions & 1 deletion delft/eris/channel-exporter.py
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
from prometheus_client import Counter, Histogram, Gauge, start_http_server, REGISTRY
import time
import sys
import logging
from pprint import pprint
import json

@@ -38,7 +39,7 @@
def measure_channel(name):
try:
with CHANNEL_REQUEST_FAILURES.count_exceptions():
result = requests.get(f"https://nixos.org/channels/{name}/git-revision")
result = requests.get(f"https://nixos.org/channels/{name}/git-revision", timeout=10)

try:
return {
@@ -56,6 +57,7 @@ def measure_channel(name):


if __name__ == "__main__":
logging.basicConfig(level=logging.DEBUG)
start_http_server(9402)

with open(sys.argv[1]) as channel_data: