Skip to content

Commit 77e2f67

Browse files
committed
Merge branch 'release/0.0.5'
2 parents e39286e + b2503ec commit 77e2f67

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## History ##
22

3+
* v0.0.5 - Now with listen port configuration
34
* v0.0.4 - Now with working task creation
45
* v0.0.3 - Better console errors
56
* v0.0.1 - initial dev release

cf/auth_service.go

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ func (service *AuthService) getUser(username string) (cf.User, error) {
5858
return cf.User{}, err
5959
}
6060

61-
fmt.Println("got", len(users), "users:", users)
62-
for i, u := range users {
63-
fmt.Println("user", i, "guid:", u.Guid)
64-
}
65-
6661
user := users.GetUserByUsername(username)
6762
if len(user.Guid) == 0 {
6863
return cf.User{}, fmt.Errorf("no such user")

cmd/scheduler/main.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"os"
88
"os/signal"
9+
"strconv"
910
"time"
1011

1112
realcf "github.com/cloudfoundry-community/go-cfclient"
@@ -30,6 +31,14 @@ func main() {
3031
log := logger.New()
3132
tag := "scheduler-for-ocf"
3233

34+
port := 8000
35+
portEnv := os.Getenv("SCHEDULER_PORT")
36+
if len(portEnv) > 0 {
37+
if t, err := strconv.Atoi(portEnv); err == nil {
38+
port = t
39+
}
40+
}
41+
3342
clientID := os.Getenv("CLIENT_ID")
3443
if len(clientID) == 0 {
3544
log.Error(tag, "CLIENT_ID not set")
@@ -156,7 +165,7 @@ func main() {
156165
}
157166
}
158167

159-
server := http.Server("0.0.0.0:8000", services)
168+
server := http.Server(fmt.Sprintf("0.0.0.0:%d", port), services)
160169

161170
go func() {
162171
if err := server.ListenAndServe(); err != nil {

mock/cf_client.go

-4
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ func (client *CFClient) ListUsersByQuery(query url.Values) (cf.Users, error) {
170170
},
171171
}
172172

173-
for i, u := range users {
174-
fmt.Println("FAKE CLIENT user", i, "guid:", u.Guid)
175-
}
176-
177173
return users, nil
178174
}
179175

0 commit comments

Comments
 (0)