Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/ATOR-Development/sbws
Browse files Browse the repository at this point in the history
…into development
  • Loading branch information
sergeiklimuk committed Jul 25, 2024
2 parents a08e452 + 99b840a commit 7cce6a8
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
2 changes: 2 additions & 0 deletions docker/scanner/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ crontab -l | { cat; echo "35 0 * * * /usr/local/bin/sbws -c /root/.sbws.ini cle

service cron start

chmod -R 644 /root/.sbws/v3bw

sbws scanner
24 changes: 18 additions & 6 deletions operations/deploy-live.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,31 @@ job "sbws-live" {
namespace = "ator-network"

group "sbws-live-group" {
count = 3
count = 7

spread {
attribute = "${node.unique.id}"
weight = 100
target "067a42a8-d8fe-8b19-5851-43079e0eabb4" {
percent = 34
percent = 14
}
target "16be0723-edc1-83c4-6c02-193d96ec308a" {
percent = 33
percent = 14
}
target "e6e0baed-8402-fd5c-7a15-8dd49e7b60d9" {
percent = 33
percent = 14
}
target "5ace4a92-63c4-ac72-3ed1-e4485fa0d4a4" {
percent = 14
}
target "eb42c498-e7a8-415f-14e9-31e9e71e5707" {
percent = 14
}
target "4aa61f61-893a-baf4-541b-870e99ac4839" {
percent = 15
}
target "c2adc610-6316-cd9d-c678-cda4b0080b52" {
percent = 15
}
}

Expand Down Expand Up @@ -67,8 +79,8 @@ job "sbws-live" {
}

resources {
cpu = 256
memory = 128
cpu = 512
memory = 1024
}

template {
Expand Down
2 changes: 1 addition & 1 deletion operations/deploy-stage.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ job "sbws-stage" {

resources {
cpu = 256
memory = 128
memory = 512
}

template {
Expand Down
2 changes: 1 addition & 1 deletion sbws/lib/v3bwfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ def read_number_consensus_relays(consensus_path):
"percentage of measured relays because the cached "
"consensus file is not found."
)
log.debug("Number of relays in the network %s", num)
log.info("Number of relays in the network %s", num)
return num

@staticmethod
Expand Down

0 comments on commit 7cce6a8

Please sign in to comment.