htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore existing jobs and fix rebase (7c99eff3) issues

Browse Source
This commit is contained in:
Maximilian Paß
2021-06-10 09:26:17 +02:00
parent 0020590c96
commit 25d78df557
23 changed files with 487 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/runners.go
View File

@ -52,6 +52,7 @@ func (r *RunnerController) provide(writer http.ResponseWriter, request *http.Req
if err == runner.ErrUnknownExecutionEnvironment {
writeNotFound(writer, err)
} else if err == runner.ErrNoRunnersAvailable {
log.WithField("environment", environmentId).Warn("No runners available")
writeInternalServerError(writer, err, dto.ErrorNomadOverload)
} else {
writeInternalServerError(writer, err, dto.ErrorUnknown)

4
api/websocket.go
View File

@ -128,9 +128,7 @@ type webSocketProxy struct {
// upgradeConnection upgrades a connection to a websocket and returns a webSocketProxy for this connection.
func upgradeConnection(writer http.ResponseWriter, request *http.Request) (webSocketConnection, error) {
connUpgrader := websocket.Upgrader{CheckOrigin: func(r *http.Request) bool {
return true
}}
connUpgrader := websocket.Upgrader{}
connection, err := connUpgrader.Upgrade(writer, request, nil)
if err != nil {
log.WithError(err).Warn("Connection upgrade failed")