Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #738 from Vlatombe/noReconnectAfter
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2024, CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.jenkinsci.remoting; | ||
|
|
||
| import java.time.Duration; | ||
| import org.jenkinsci.remoting.util.DurationFormatter; | ||
| import org.jenkinsci.remoting.util.DurationStyle; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.NoExternalUse; | ||
| import org.kohsuke.args4j.CmdLineException; | ||
| import org.kohsuke.args4j.CmdLineParser; | ||
| import org.kohsuke.args4j.OptionDef; | ||
| import org.kohsuke.args4j.spi.OptionHandler; | ||
| import org.kohsuke.args4j.spi.Parameters; | ||
| import org.kohsuke.args4j.spi.Setter; | ||
|
|
||
| /** | ||
| * Parses a string like 1s, 2m, 3h, 4d into a {@link Duration}. | ||
| */ | ||
| @Restricted(NoExternalUse.class) | ||
| public class DurationOptionHandler extends OptionHandler<Duration> { | ||
| public DurationOptionHandler(CmdLineParser parser, OptionDef option, Setter<? super Duration> setter) { | ||
| super(parser, option, setter); | ||
| } | ||
|
|
||
| @Override | ||
| public int parseArguments(Parameters params) throws CmdLineException { | ||
| setter.addValue(DurationStyle.detectAndParse(params.getParameter(0))); | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDefaultMetaVariable() { | ||
| return "DURATION"; | ||
| } | ||
|
|
||
| @Override | ||
| protected String print(Duration v) { | ||
| return DurationFormatter.format(v); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2024, CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.jenkinsci.remoting.util; | ||
|
|
||
| import java.time.Duration; | ||
| import java.time.temporal.ChronoUnit; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.NoExternalUse; | ||
|
|
||
| /** | ||
| * Formats a {@link Duration} into a human-readable string. | ||
| */ | ||
| @Restricted(NoExternalUse.class) | ||
| public final class DurationFormatter { | ||
| private DurationFormatter(){} | ||
|
|
||
| public static String format(Duration d) { | ||
| StringBuilder sb = new StringBuilder(); | ||
| boolean first = true; | ||
| long days = d.toDays(); | ||
| if (days > 0) { | ||
| first = formatDurationPart(true, sb, days, "day"); | ||
| d = d.minus(days, ChronoUnit.DAYS); | ||
| } | ||
| long hours = d.toHours(); | ||
| if (hours > 0) { | ||
| first = formatDurationPart(first, sb, hours, "hour"); | ||
| d = d.minus(hours, ChronoUnit.HOURS); | ||
| } | ||
| long minutes = d.toMinutes(); | ||
| if (minutes > 0) { | ||
| first = formatDurationPart(first, sb, minutes, "minute"); | ||
| d = d.minus(minutes, ChronoUnit.MINUTES); | ||
| } | ||
| long seconds = d.getSeconds(); | ||
| if (seconds > 0) { | ||
| formatDurationPart(first, sb, seconds, "second"); | ||
| } | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| private static boolean formatDurationPart(boolean first, StringBuilder sb, long amount, String unit) { | ||
| if (!first) { | ||
| sb.append(", "); | ||
| } else { | ||
| first = false; | ||
| } | ||
| sb.append(amount).append(" ").append(unit).append(amount > 1 ? "s" : ""); | ||
| return first; | ||
| } | ||
| } |
Oops, something went wrong.