Merge branch 'master' of https://github.com/taskcluster/generic-worker into bug1534223

Author: petemoore

README.md

@@ -459,17 +459,15 @@ In v14.1.0 since v14.0.2
 
   To enable websocktunnel, include configuration options `wstAudience` and `wstServerURL` to correspond to the websocktunnel server the worker should use.
   For the current production environment that would be:
-  
+
   ```json
   {
-    ...
     "wstAudience": "taskcluster-net",
-    "wstServerURL": "https://websocktunnel.tasks.build",
-    ...
+    "wstServerURL": "https://websocktunnel.tasks.build"
   }
   ```
-  
-  Omit the configuration items `livelogCertificate`, `livelogKey`, and `livelogSecret`.
+
+  Omit the configuration items `subdomain`, `livelogGETPort`, `livelogCertificate`, `livelogKey`, and `livelogSecret`.
   These options will be removed in a future release.
 
   Ensure that the worker's credentials have scope `auth:websocktunnel-token:<wstAudience>/<workerGroup>.<workerId>.*`.

main.go

@@ -916,7 +916,7 @@ func (task *TaskRun) logHeader() {
 	if err != nil {
 		panic(err)
 	}
-	task.Info("Worker Type (" + config.WorkerType + ") settings:")
+	task.Infof("Worker Type (%v/%v) settings:", config.ProvisionerID, config.WorkerType)
 	task.Info("  " + string(jsonBytes))
 	task.Info("Task ID: " + task.TaskID)
 	task.Info("=== Task Starting ===")

plat_all-unix-style.go

@@ -85,7 +85,9 @@ func purgeOldTasks() error {
 		log.Printf("WARNING: Not purging previous task directories/users since config setting cleanUpTaskDirs is false")
 		return nil
 	}
-	return deleteTaskDirs(config.TasksDir, taskContext.User.Name)
+	// Use filepath.Base(taskContext.TaskDir) rather than taskContext.User.Name
+	// since taskContext.User is nil if running tasks as current user.
+	return deleteTaskDirs(config.TasksDir, filepath.Base(taskContext.TaskDir))
 }
 
 func install(arguments map[string]interface{}) (err error) {