Skip to content

Commit 310b8ff

Browse files
bebo-dot-devbebo-dot-dev
committed
cosmetics
1 parent 0312d5c commit 310b8ff

File tree

4 files changed

+42
-19
lines changed

4 files changed

+42
-19
lines changed

‎cmd/go-postgres-sockets/static/index.html‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,30 @@
44
<title>Postgres DB Notifications</title>
55
<script type="text/javascript">
66
window.onload = function () {
7-
var conn;
8-
var msg = document.getElementById("msg");
9-
var log = document.getElementById("log");
7+
let conn;
8+
const log = document.getElementById("log");
109

11-
function appendLog(item) {
12-
var doScroll = log.scrollTop > log.scrollHeight - log.clientHeight - 1;
10+
function newLogItem(html, selector) {
11+
const item = document.createElement("div");
12+
if (selector) {
13+
item.className = selector;
14+
}
15+
if (html) {
16+
item.innerHTML = html;
17+
}
18+
appendLogItem(item);
19+
}
20+
21+
function appendLogItem(item) {
22+
const doScroll = log.scrollTop > log.scrollHeight - log.clientHeight - 1;
1323
log.appendChild(item);
1424
if (doScroll) {
1525
log.scrollTop = log.scrollHeight - log.clientHeight;
1626
}
1727
}
1828

1929
document.getElementById("form").onsubmit = function () {
20-
var payload = {};
30+
const payload = {};
2131
payload.notificationType = parseInt($("#form select").val());
2232
payload.notificationText = $("#form input[type=text]").val();
2333
$.ajax({
@@ -35,23 +45,22 @@
3545

3646
if (window["WebSocket"]) {
3747
conn = new WebSocket("ws://" + document.location.host + "/ws");
48+
conn.onopen = function (evt) {
49+
newLogItem("<b>socket opened</b>");
50+
};
3851
conn.onclose = function (evt) {
39-
var item = document.createElement("div");
40-
item.innerHTML = "<b>socket closed</b>";
41-
appendLog(item);
52+
newLogItem("<b>socket closed</b>");
4253
};
4354
conn.onmessage = function (evt) {
44-
var messages = evt.data.split('\n');
45-
for (var i = 0; i < messages.length; i++) {
46-
var item = document.createElement("div");
47-
item.innerText = messages[i];
48-
appendLog(item);
55+
newLogItem(null, 'mono');
56+
const msgParts = evt.data.split('\n');
57+
for (let i = 0; i < msgParts.length; i++) {
58+
const html = msgParts[i].replaceAll(" ", "&nbsp;")
59+
newLogItem(html, 'mono');
4960
}
5061
};
5162
} else {
52-
var item = document.createElement("div");
53-
item.innerHTML = "<b>Your browser does not support WebSockets.</b>";
54-
appendLog(item);
63+
newLogItem(null, "<b>Your browser does not support WebSockets</b>");
5564
}
5665
};
5766
</script>
@@ -81,6 +90,12 @@
8190
overflow: auto;
8291
}
8392

93+
#log .mono {
94+
font-family: 'Courier New', monospace;
95+
min-height: 15px;
96+
97+
}
98+
8499
#form {
85100
padding: 0 0.5em 0 0.5em;
86101
margin: 0;
@@ -91,6 +106,9 @@
91106
overflow: hidden;
92107
}
93108

109+
#form input[type=text] {
110+
width: 300px;
111+
}
94112
</style>
95113
</head>
96114
<body>

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/bebo-dot-dev/go-postgres-sockets
33
go 1.16
44

55
require (
6-
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801091928-baaf9aa50a16
6+
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801123152-84c1f69e485b
77
github.com/gorilla/handlers v1.5.1
8+
github.com/gorilla/mux v1.7.3
89
)

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801091450-d390bf5
1212
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801091450-d390bf5b782e/go.mod h1:TvRvBsD2NAjwklFzsDjw8b0LFa06gMUJbDx/U8fisqQ=
1313
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801091928-baaf9aa50a16 h1:3rycyUBPl3DsXCt7ihx4Mzo6jPKTXeO0AJhBzt9GqvY=
1414
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801091928-baaf9aa50a16/go.mod h1:TvRvBsD2NAjwklFzsDjw8b0LFa06gMUJbDx/U8fisqQ=
15+
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801122502-27e1e06ab5f9 h1:BydCZRtzCHHo+02LUDH/Ghf/xs42BSMSl8YgWfRQAXc=
16+
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801122502-27e1e06ab5f9/go.mod h1:TvRvBsD2NAjwklFzsDjw8b0LFa06gMUJbDx/U8fisqQ=
17+
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801123152-84c1f69e485b h1:RWlnKeiFiYWh2mPbV4Ql1Vt4TGfXr0b8bpK8Iq8vtLY=
18+
github.com/bebo-dot-dev/go-postgres-sockets/server v0.0.0-20210801123152-84c1f69e485b/go.mod h1:TvRvBsD2NAjwklFzsDjw8b0LFa06gMUJbDx/U8fisqQ=
1519
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
1620
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1721
github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=

‎server/database/listener.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (l *PostgresDbListener) waitForNotification(dbl *pq.Listener) {
6969
case n := <- dbl.Notify:
7070
log.Println("DB listener received data from channel [", n.Channel, "] :")
7171
var prettyJSON bytes.Buffer
72-
err := json.Indent(&prettyJSON, []byte(n.Extra), "", "\t")
72+
err := json.Indent(&prettyJSON, []byte(n.Extra), "", " ")
7373
if err != nil {
7474
log.Println("DB listener error processing JSON: ", err)
7575
}

0 commit comments

Comments
 (0)