Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
bahn-proxy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
bahn-proxy
Commits
41ba6305
Verified
Commit
41ba6305
authored
6 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Improve logging
parent
fd963d6e
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
main.go
+14
-16
14 additions, 16 deletions
main.go
with
14 additions
and
16 deletions
main.go
+
14
−
16
View file @
41ba6305
...
@@ -6,7 +6,6 @@ import (
...
@@ -6,7 +6,6 @@ import (
"git.kuschku.de/justjanne/bahn-api"
"git.kuschku.de/justjanne/bahn-api"
"github.com/golang/glog"
"github.com/golang/glog"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v2"
"log"
"net/http"
"net/http"
"os"
"os"
"path"
"path"
...
@@ -105,7 +104,7 @@ func main() {
...
@@ -105,7 +104,7 @@ func main() {
result
:=
append
(
append
(
perfectMatch
,
prefix
...
),
contains
...
)
result
:=
append
(
append
(
perfectMatch
,
prefix
...
),
contains
...
)
if
err
:=
returnJson
(
w
,
result
);
err
!=
nil
{
if
err
:=
returnJson
(
w
,
result
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
}
else
if
position
,
err
:=
PositionFromString
(
strings
.
TrimSpace
(
r
.
FormValue
(
"position"
)));
err
==
nil
{
}
else
if
position
,
err
:=
PositionFromString
(
strings
.
TrimSpace
(
r
.
FormValue
(
"position"
)));
err
==
nil
{
...
@@ -124,7 +123,7 @@ func main() {
...
@@ -124,7 +123,7 @@ func main() {
})
})
if
err
:=
returnJson
(
w
,
result
[
:
config
.
MaxResults
]);
err
!=
nil
{
if
err
:=
returnJson
(
w
,
result
[
:
config
.
MaxResults
]);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
}
}
...
@@ -137,18 +136,18 @@ func main() {
...
@@ -137,18 +136,18 @@ func main() {
var
evaId
int64
var
evaId
int64
if
evaId
,
err
=
strconv
.
ParseInt
(
rawEvaId
,
10
,
64
);
err
!=
nil
{
if
evaId
,
err
=
strconv
.
ParseInt
(
rawEvaId
,
10
,
64
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
var
stations
[]
bahn
.
Station
var
stations
[]
bahn
.
Station
if
stations
,
err
=
apiClient
.
Station
(
evaId
);
err
!=
nil
{
if
stations
,
err
=
apiClient
.
Station
(
evaId
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
if
err
=
returnJson
(
w
,
stations
);
err
!=
nil
{
if
err
=
returnJson
(
w
,
stations
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
})
})
...
@@ -160,7 +159,7 @@ func main() {
...
@@ -160,7 +159,7 @@ func main() {
var
evaId
int64
var
evaId
int64
if
evaId
,
err
=
strconv
.
ParseInt
(
rawEvaId
,
10
,
64
);
err
!=
nil
{
if
evaId
,
err
=
strconv
.
ParseInt
(
rawEvaId
,
10
,
64
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
...
@@ -176,7 +175,7 @@ func main() {
...
@@ -176,7 +175,7 @@ func main() {
var
timetable
bahn
.
Timetable
var
timetable
bahn
.
Timetable
measure
(
"timetable"
,
func
()
{
measure
(
"timetable"
,
func
()
{
if
timetable
,
err
=
apiClient
.
Timetable
(
evaId
,
date
);
err
!=
nil
{
if
timetable
,
err
=
apiClient
.
Timetable
(
evaId
,
date
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
for
_
,
stop
:=
range
timetable
.
Stops
{
for
_
,
stop
:=
range
timetable
.
Stops
{
...
@@ -189,7 +188,7 @@ func main() {
...
@@ -189,7 +188,7 @@ func main() {
var
realtime
bahn
.
Timetable
var
realtime
bahn
.
Timetable
measure
(
"realtime"
,
func
()
{
measure
(
"realtime"
,
func
()
{
if
realtime
,
err
=
apiClient
.
RealtimeAll
(
evaId
,
date
);
err
!=
nil
{
if
realtime
,
err
=
apiClient
.
RealtimeAll
(
evaId
,
date
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
for
_
,
stop
:=
range
realtime
.
Stops
{
for
_
,
stop
:=
range
realtime
.
Stops
{
...
@@ -204,12 +203,12 @@ func main() {
...
@@ -204,12 +203,12 @@ func main() {
for
key
,
combined
:=
range
data
{
for
key
,
combined
:=
range
data
{
if
combined
.
Timetable
.
Arrival
!=
nil
&&
combined
.
Timetable
.
Arrival
.
Wings
!=
""
{
if
combined
.
Timetable
.
Arrival
!=
nil
&&
combined
.
Timetable
.
Arrival
.
Wings
!=
""
{
if
combined
.
WingDefinition
,
err
=
apiClient
.
WingDefinition
(
combined
.
Timetable
.
StopId
,
combined
.
Timetable
.
Arrival
.
Wings
);
err
!=
nil
{
if
combined
.
WingDefinition
,
err
=
apiClient
.
WingDefinition
(
combined
.
Timetable
.
StopId
,
combined
.
Timetable
.
Arrival
.
Wings
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
}
else
if
combined
.
Timetable
.
Departure
!=
nil
&&
combined
.
Timetable
.
Departure
.
Wings
!=
""
{
}
else
if
combined
.
Timetable
.
Departure
!=
nil
&&
combined
.
Timetable
.
Departure
.
Wings
!=
""
{
if
combined
.
WingDefinition
,
err
=
apiClient
.
WingDefinition
(
combined
.
Timetable
.
StopId
,
combined
.
Timetable
.
Departure
.
Wings
);
err
!=
nil
{
if
combined
.
WingDefinition
,
err
=
apiClient
.
WingDefinition
(
combined
.
Timetable
.
StopId
,
combined
.
Timetable
.
Departure
.
Wings
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
}
}
...
@@ -231,7 +230,7 @@ func main() {
...
@@ -231,7 +230,7 @@ func main() {
searchQuery := fmt.Sprintf("%s %s", combined.Timetable.TripLabel.TripCategory, combined.Timetable.TripLabel.TripNumber)
searchQuery := fmt.Sprintf("%s %s", combined.Timetable.TripLabel.TripCategory, combined.Timetable.TripLabel.TripNumber)
var suggestions []bahn.Suggestion
var suggestions []bahn.Suggestion
if suggestions, err = apiClient.Suggestions(searchQuery, moment); err != nil {
if suggestions, err = apiClient.Suggestions(searchQuery, moment); err != nil {
log.
Println
(err)
g
log.
Warning
(err)
return
return
}
}
var targetStation = timetable.Station
var targetStation = timetable.Station
...
@@ -264,7 +263,7 @@ func main() {
...
@@ -264,7 +263,7 @@ func main() {
for key, combined := range data {
for key, combined := range data {
if combined.TrainLink != "" {
if combined.TrainLink != "" {
if combined.HafasMessages, err = apiClient.HafasMessages(combined.TrainLink); err != nil {
if combined.HafasMessages, err = apiClient.HafasMessages(combined.TrainLink); err != nil {
log.
Println
(err)
g
log.
Warning
(err)
return
return
}
}
}
}
...
@@ -272,7 +271,6 @@ func main() {
...
@@ -272,7 +271,6 @@ func main() {
}
}
})
})
*/
*/
})
})
var
result
[]
InternalModel
var
result
[]
InternalModel
...
@@ -281,7 +279,7 @@ func main() {
...
@@ -281,7 +279,7 @@ func main() {
}
}
if
err
=
returnJson
(
w
,
result
);
err
!=
nil
{
if
err
=
returnJson
(
w
,
result
);
err
!=
nil
{
log
.
Println
(
err
)
g
log
.
Warning
(
err
)
return
return
}
}
})
})
...
@@ -290,6 +288,6 @@ func main() {
...
@@ -290,6 +288,6 @@ func main() {
_
,
_
=
w
.
Write
([]
byte
(
"ok
\n
"
))
_
,
_
=
w
.
Write
([]
byte
(
"ok
\n
"
))
})
})
if
err
:=
http
.
ListenAndServe
(
*
listen
,
nil
);
err
!=
nil
{
if
err
:=
http
.
ListenAndServe
(
*
listen
,
nil
);
err
!=
nil
{
log
.
Fatal
(
err
)
g
log
.
Error
(
err
)
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment