From ff3170353f830fa977da09e907db50867c43ed32 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 14:26:41 -0700 Subject: [PATCH 1/6] allow changing the minimum ping time --- .../main/java/us/ajg0702/queue/common/TaskManager.java | 2 +- common/src/main/resources/config.yml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/common/TaskManager.java b/common/src/main/java/us/ajg0702/queue/common/TaskManager.java index 18fcbde..52f3b0b 100644 --- a/common/src/main/java/us/ajg0702/queue/common/TaskManager.java +++ b/common/src/main/java/us/ajg0702/queue/common/TaskManager.java @@ -56,7 +56,7 @@ public class TaskManager { updateTask = scheduleAtFixedRate(updateExecutor, main.getQueueManager()::updateServers, 500L, - (long) (Math.max(main.getTimeBetweenPlayers()/2, 1)*1000L), + (long) (Math.max(main.getTimeBetweenPlayers()/2, main.getConfig().getDouble("minimum-ping-time"))*1000L), TimeUnit.MILLISECONDS ); diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 10970b5..9153d00 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -1,5 +1,5 @@ # Dont touch this number please -config-version: 32 +config-version: 33 # This is the main config for ajQueue. @@ -11,7 +11,7 @@ config-version: 32 # The time the server will wait between sending people in the queue # Default: 5 -wait-time: 5 +wait-time: 5.0 # The time that a server has to be offline to be marked as offline instead of restarting # Default: 120 @@ -309,5 +309,10 @@ give-fulljoin-players-priority: 0 # not in the queue for the target server, it will add them. force-queue-server-target: true + +# The minimum time between pinging the server. +# If ajQueue is pinging your backend servers too often, raise this number +minimum-ping-time: 1.0 + # Should we print some extra stuff to the console that might help aj diagnose some issues? debug: false \ No newline at end of file From 8e08d4f62452cb5d0b4817be50a57915b9ad547d Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 14:52:31 -0700 Subject: [PATCH 2/6] add github workflow --- .github/workflows/gradle.yml | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..37c8304 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,40 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'temurin' + - name: Build with Gradle + uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 + with: + arguments: :free:shadowJar + - name: Upload a Build Artifact + uses: actions/upload-artifact@v2.3.1 + with: + # Artifact name + name: plugin jar + # A file, directory or wildcard pattern that describes what to upload + path: build/libs/ajQueue*.jar + # The desired behavior if no files are found using the provided path. + if-no-files-found: error \ No newline at end of file From f96b4965106de523cc5bb135d39e0d8524c153c1 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 14:53:52 -0700 Subject: [PATCH 3/6] make github workflow run on all branches --- .github/workflows/gradle.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 37c8304..d0cc0bc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,11 +7,7 @@ name: Java CI with Gradle -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] jobs: build: From 9bd1825beab287f8996eeb19ed49a258628494c6 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 14:56:27 -0700 Subject: [PATCH 4/6] 2.2.4 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3b76dd3..e9b0f94 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ repositories { } allprojects { - version = "2.2.3" + version = "2.2.4" group = "us.ajg0702" plugins.apply("java") From dc5b9ef16e90baba342438f0e7a474e26e758fca Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 14:59:34 -0700 Subject: [PATCH 5/6] fix ci looking for artifacts in the wrong folder --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d0cc0bc..59059f4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -31,6 +31,6 @@ jobs: # Artifact name name: plugin jar # A file, directory or wildcard pattern that describes what to upload - path: build/libs/ajQueue*.jar + path: free/build/libs/ajQueue*.jar # The desired behavior if no files are found using the provided path. if-no-files-found: error \ No newline at end of file From cc5ea96c8843de7a6d81bee79418fb37636efc8b Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 22 Feb 2022 15:31:43 -0700 Subject: [PATCH 6/6] attempt to run deploy on github --- .github/workflows/gradle.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 59059f4..48f783c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -25,7 +25,7 @@ jobs: uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 with: arguments: :free:shadowJar - - name: Upload a Build Artifact + - name: Upload plugin jar artifact uses: actions/upload-artifact@v2.3.1 with: # Artifact name @@ -33,4 +33,28 @@ jobs: # A file, directory or wildcard pattern that describes what to upload path: free/build/libs/ajQueue*.jar # The desired behavior if no files are found using the provided path. - if-no-files-found: error \ No newline at end of file + if-no-files-found: error + - name: Upload build files artifact + uses: actions/upload-artifact@v2.3.1 + with: + # Artifact name + name: build-files + # A file, directory or wildcard pattern that describes what to upload + path: '*/build/*' + # The desired behavior if no files are found using the provided path. + if-no-files-found: error + retention-days: 2 + deploy: + runs-on: ubuntu-latest + environment: maven-repo-deploy + needs: build + if: github.ref == 'refs/heads/master' + steps: + - uses: actions/checkout@v2 + - uses: actions/download-artifact@v2 + with: + name: build-files + - name: Deploy with Gradle + uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7 + with: + arguments: :api:publish :common:publish \ No newline at end of file