Skip to content

Commit f9ac124

Browse files
committed
sync
1 parent 80333bf commit f9ac124

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

assets/templates_src/internal/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>Home<small>...</small></h1>
3838
</div>
3939
<footer class="main-footer">
4040
<div class="pull-right hidden-xs">
41-
<b>Version</b> 0.2
41+
<b>Version</b> 0.3
4242
</div>
4343
<strong>Postgres</strong>-CI
4444
</footer>

assets/templates_src/internal/layout/header.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
<li class="dropdown">
1313
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% verbatim %}{{ CurrentUser.Name }} {% endverbatim %} <span class="caret"></span></a>
1414
<ul class="dropdown-menu" role="menu">
15+
<li><a href="#">Change notifications settings</a></li>
16+
<li class="divider"></li>
1517
<li><a href="#" data-toggle="modal" data-target="#changePassword">Change password</a></li>
16-
<!--li class="divider"></li-->
1718
</ul>
1819
</li>
1920
<li><a href="/logout/"><i class="fa fa-sign-out"></i></a></li>

assets/templates_src/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<form method="post">
2727
<div class="form-group has-feedback">
2828
<input type="text" class="form-control" autocomplete="off" placeholder="Login" name="login">
29-
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
29+
<span class="glyphicon glyphicon-user form-control-feedback"></span>
3030
</div>
3131
<div class="form-group has-feedback">
3232
<input type="password" class="form-control" placeholder="Password" name="password">

assets/templates_src/project/view_build.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h3 class="box-title">Commit {{ build.CommitSHA }}</h3>
2828
<br>
2929
<strong>Branch:</strong> <a href="/project-{{ build.ProjectID }}/builds/branch-{{ build.BranchID }}/">{{ build.Branch }}</a><br>
3030
<strong>Author:</strong> {{ build.AuthorName }} ({{ build.AuthorEmail }})<br>
31-
{% if build.AuthorName != build.CommitterName %}<br>
31+
{% if build.AuthorName != build.CommitterName %}
3232
<strong>Commiter:</strong> {{ build.CommitterName }} ({{ build.CommitterEmail }})<br>
3333
{% endif %}
3434
<strong>Commited:</strong> {{ build.CommittedAt | time:"Mon, 02 Jan 2006 15:04:05 -0700"}}<br>
@@ -106,7 +106,7 @@ <h3 class="box-title">
106106
</tbody>
107107
</table>
108108
{% if part.TestsLen() > 20 %}
109-
<script>$('#tests_{{ forloop.Counter }}').DataTable({'pageLength':20, 'lengthChange': false});</script>
109+
<script>$('#tests_{{ forloop.Counter }}').DataTable({'pageLength':20, 'lengthChange': false, 'sort' : false});</script>
110110
{% endif %}
111111
{% endif %}
112112
</div>

src/app/app.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,21 @@ import (
1111
"github.com/postgres-ci/http200ok"
1212

1313
"net/http"
14+
"os"
15+
"runtime"
1416
)
1517

1618
func New(config common.Config) *app {
1719

18-
log.Debugf("Connect to postgresql server. DSN(%s)", config.Connect.DSN())
19-
2020
connect, err := sqlx.Connect("postgres", config.Connect.DSN())
2121

2222
if err != nil {
2323

2424
log.Fatalf("Could not connect to database server: %v", err)
2525
}
2626

27+
log.Debugf("Connect to postgresql server. DSN(%s)", config.Connect.DSN())
28+
2729
env.SetConnect(connect)
2830

2931
app := &app{
@@ -46,5 +48,8 @@ func (app *app) Run() {
4648

4749
routines.Run()
4850

51+
log.Infof("Postgres-CI app-server running on address: %s, pid: %d", app.address, os.Getpid())
52+
log.Debugf("Runtime version: %s", runtime.Version())
53+
4954
log.Fatal(http.ListenAndServe(app.address, app.Server))
5055
}

src/env/env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func SetConnect(c *sqlx.DB) {
2020

2121
connect.SetMaxOpenConns(MaxOpenConns)
2222
connect.SetMaxIdleConns(MaxIdleConns)
23-
// connect.SetConnMaxLifetime(ConnMaxLifetime)
23+
connect.SetConnMaxLifetime(ConnMaxLifetime)
2424
}
2525

2626
func Connect() *sqlx.DB {

0 commit comments

Comments
 (0)