[Leasing server] Followup fixes for lit-html
* Pass in a host flag instead of hardcoding it.
* Show locale specific timestamp in UI, it is less confusing.
Bug: skia:10116
Change-Id: Ifba4ee92b246ce7dd28f0619f008d3bfc4d48345
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/282358
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
diff --git a/leasing/go/leasing/mail.go b/leasing/go/leasing/mail.go
index 250605c..eb1b654 100644
--- a/leasing/go/leasing/mail.go
+++ b/leasing/go/leasing/mail.go
@@ -76,7 +76,7 @@
<br/><br/>
Thanks!
`
- body := fmt.Sprintf(bodyTemplate, taskLink, GetSwarmingBotLink(swarmingServer, swarmingBot), swarmingBot, sectionAboutIsolates, connectionInstructionsPage, fmt.Sprintf("%s%s", prodURI, myLeasesURI))
+ body := fmt.Sprintf(bodyTemplate, taskLink, GetSwarmingBotLink(swarmingServer, swarmingBot), swarmingBot, sectionAboutIsolates, connectionInstructionsPage, fmt.Sprintf("https://%s%s", *host, myLeasesURI))
markup, err := getSwarmingLinkMarkup(taskLink)
if err != nil {
return fmt.Errorf("Failed to get view action markup: %s", err)
@@ -97,7 +97,7 @@
<br/><br/>
Thanks!
`
- body := fmt.Sprintf(bodyTemplate, taskLink, fmt.Sprintf("%s%s", prodURI, myLeasesURI))
+ body := fmt.Sprintf(bodyTemplate, taskLink, fmt.Sprintf("https://%s%s", *host, myLeasesURI))
markup, err := getSwarmingLinkMarkup(taskLink)
if err != nil {
return fmt.Errorf("Failed to get view action markup: %s", err)
@@ -114,13 +114,13 @@
bodyTemplate := `
Your <a href="%s">leasing task</a> unexpectedly ended with the state: %s.
<br/><br/>
- You can reschedule another leasing task <a href="%s">here</a>.
+ You can reschedule another leasing task <a href="https://%s">here</a>.
<br/>
Contact the CC'ed trooper if you have any questions.
<br/><br/>
Thanks!
`
- body := fmt.Sprintf(bodyTemplate, taskLink, swarmingTaskState, prodURI)
+ body := fmt.Sprintf(bodyTemplate, taskLink, swarmingTaskState, *host)
markup, err := getSwarmingLinkMarkup(taskLink)
if err != nil {
return fmt.Errorf("Failed to get view action markup: %s", err)
@@ -137,11 +137,11 @@
bodyTemplate := `
Your <a href="%s">leasing task</a> has been extended by %dhr.
<br/><br/>
- If needed, you can reschedule more leasing tasks <a href="%s">here</a>.
+ If needed, you can reschedule more leasing tasks <a href="https://%s">here</a>.
<br/><br/>
Thanks!
`
- body := fmt.Sprintf(bodyTemplate, taskLink, durationHrs, prodURI)
+ body := fmt.Sprintf(bodyTemplate, taskLink, durationHrs, *host)
markup, err := getSwarmingLinkMarkup(taskLink)
if err != nil {
return fmt.Errorf("Failed to get view action markup: %s", err)
@@ -158,11 +158,11 @@
bodyTemplate := `
Your <a href="%s">leasing task</a> has completed.
<br/><br/>
- If needed, you can reschedule more leasing tasks <a href="%s">here</a>.
+ If needed, you can reschedule more leasing tasks <a href="https://%s">here</a>.
<br/><br/>
Thanks!
`
- body := fmt.Sprintf(bodyTemplate, taskLink, prodURI)
+ body := fmt.Sprintf(bodyTemplate, taskLink, *host)
markup, err := getSwarmingLinkMarkup(taskLink)
if err != nil {
return fmt.Errorf("Failed to get view action markup: %s", err)
diff --git a/leasing/go/leasing/main.go b/leasing/go/leasing/main.go
index 7f68713..e1b866e 100644
--- a/leasing/go/leasing/main.go
+++ b/leasing/go/leasing/main.go
@@ -49,11 +49,11 @@
addTaskPostURI = "/_/add_leasing_task"
extendTaskPostURI = "/_/extend_leasing_task"
expireTaskPostURI = "/_/expire_leasing_task"
- prodURI = "https://leasing.skia.org"
)
var (
// Flags
+ host = flag.String("host", "leasing.skia.org", "HTTP service host")
workdir = flag.String("workdir", ".", "Directory to use for scratch work.")
isolatesDir = flag.String("isolates_dir", "", "The directory to find leasing server's isolates files.")
pollInterval = flag.Duration("poll_interval", 1*time.Minute, "How often the leasing server will check if tasks have expired.")
@@ -69,8 +69,6 @@
// OAUTH params
authWhiteList = flag.String("auth_whitelist", "google.com", "White space separated list of domains and email addresses that are allowed to login.")
- serverURL string
-
poolToDetails map[string]*PoolDetails
poolToDetailsMutex sync.Mutex
)
@@ -547,7 +545,7 @@
return
}
// Trigger the swarming task.
- swarmingTaskId, err := TriggerSwarmingTask(task.SwarmingPool, task.Requester, strconv.Itoa(int(datastoreKey.ID)), task.OsType, task.DeviceType, task.SwarmingBotId, serverURL, isolateHash, isolateDetails)
+ swarmingTaskId, err := TriggerSwarmingTask(task.SwarmingPool, task.Requester, strconv.Itoa(int(datastoreKey.ID)), task.OsType, task.DeviceType, task.SwarmingBotId, *host, isolateHash, isolateDetails)
if err != nil {
httputils.ReportError(w, err, fmt.Sprintf("Error when triggering swarming task: %v", err), http.StatusInternalServerError)
return
@@ -574,5 +572,5 @@
}
func main() {
- baseapp.Serve(New, []string{"leasing.skia.org"})
+ baseapp.Serve(New, []string{*host})
}
diff --git a/leasing/go/leasing/swarming.go b/leasing/go/leasing/swarming.go
index a6e2816..6041584 100644
--- a/leasing/go/leasing/swarming.go
+++ b/leasing/go/leasing/swarming.go
@@ -279,7 +279,7 @@
}
}
-func TriggerSwarmingTask(pool, requester, datastoreId, osType, deviceType, botId, serverURLstring, isolateHash string, isolateDetails *IsolateDetails) (string, error) {
+func TriggerSwarmingTask(pool, requester, datastoreId, osType, deviceType, botId, serverURL, isolateHash string, isolateDetails *IsolateDetails) (string, error) {
dimsMap := map[string]string{
"pool": pool,
}
diff --git a/leasing/isolates/leasing.py b/leasing/isolates/leasing.py
index e04d1ff..29a7c10 100644
--- a/leasing/isolates/leasing.py
+++ b/leasing/isolates/leasing.py
@@ -19,7 +19,8 @@
def main():
parser = argparse.ArgumentParser()
parser.add_argument('-s', '--leasing-server', required=True, type=str,
- help='The leasing server this script will poll.')
+ help='The leasing server this script will poll. '
+ 'Eg: leasing.skia.org')
parser.add_argument('-t', '--task-id', required=True, type=str,
help='The taskID of this swarming task.')
parser.add_argument('-o', '--os-type', required=True, type=str,
@@ -46,7 +47,7 @@
sys.stdout.flush()
while True:
- get_task_status_url = '%s/_/get_task_status?task=%s' % (
+ get_task_status_url = 'http://%s/_/get_task_status?task=%s' % (
args.leasing_server, args.task_id)
try:
resp = urllib2.urlopen(get_task_status_url)
diff --git a/leasing/modules/leasing-task-sk/leasing-task-sk.js b/leasing/modules/leasing-task-sk/leasing-task-sk.js
index d7c5fb4..e6dc558 100644
--- a/leasing/modules/leasing-task-sk/leasing-task-sk.js
+++ b/leasing/modules/leasing-task-sk/leasing-task-sk.js
@@ -37,7 +37,7 @@
return timestamp;
}
const d = new Date(timestamp);
- return d.toUTCString();
+ return d.toLocaleString();
}
function displayLeaseStartTime(task) {
