Skip to content

Commit 33c6798

Browse files
sosweethamcoodos
andauthored
feat: setup logger (#282)
* feat: setup logger * fix: add back log * fix: update lockfile * fix: format * feat: add grafana for loki visualization * fix: logs tested --------- Co-authored-by: Merul Dhiman <[email protected]>
1 parent 6aeda11 commit 33c6798

File tree

12 files changed

+113
-3
lines changed

12 files changed

+113
-3
lines changed

control-panel.compose.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
networks:
2+
loki:
3+
4+
services:
5+
loki:
6+
image: grafana/loki:latest
7+
ports:
8+
- "3100:3100"
9+
command: -config.file=/etc/loki/local-config.yaml
10+
networks:
11+
- loki
12+
13+
promtail:
14+
image: grafana/promtail:latest
15+
volumes:
16+
- /var/log:/var/log
17+
command: -config.file=/etc/promtail/config.yml
18+
networks:
19+
- loki
20+
21+
grafana:
22+
environment:
23+
- GF_PATHS_PROVISIONING=/etc/grafana/provisioning
24+
- GF_AUTH_ANONYMOUS_ENABLED=true
25+
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
26+
- GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode
27+
entrypoint:
28+
- sh
29+
- -euc
30+
- |
31+
mkdir -p /etc/grafana/provisioning/datasources
32+
cat <<EOF > /etc/grafana/provisioning/datasources/ds.yaml
33+
apiVersion: 1
34+
datasources:
35+
- name: Loki
36+
type: loki
37+
access: proxy
38+
orgId: 1
39+
url: http://loki:3100
40+
basicAuth: false
41+
isDefault: true
42+
version: 1
43+
editable: false
44+
EOF
45+
/run.sh
46+
image: grafana/grafana:latest
47+
ports:
48+
- "3000:3000"
49+
networks:
50+
- loki

evault.docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- W3ID=${W3ID}
1717
volumes:
1818
- secrets:/app/secrets
19-
networks:
19+
networks:
2020
- graphnet
2121
depends_on:
2222
- neo4j

infrastructure/eid-wallet/src-tauri/gen/android/.idea/AndroidProjectSystem.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infrastructure/web3-adapter/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"axios": "^1.6.7",
1919
"evault-core": "workspace:*",
2020
"graphql-request": "^6.1.0",
21+
"pino": "^9.8.0",
22+
"pino-loki": "^2.6.0",
2123
"sqlite3": "^5.1.7",
2224
"test": "^3.3.0",
2325
"uuid": "^11.1.0",
@@ -35,6 +37,8 @@
3537
"jest": {
3638
"preset": "ts-jest",
3739
"testEnvironment": "node",
38-
"testMatch": ["**/__tests__/**/*.test.ts"]
40+
"testMatch": [
41+
"**/__tests__/**/*.test.ts"
42+
]
3943
}
4044
}

infrastructure/web3-adapter/src/index.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import axios from "axios";
44
import { v4 as uuidv4 } from "uuid";
55
import { MappingDatabase } from "./db";
66
import { EVaultClient } from "./evault/evault";
7+
import { logger } from "./logging";
78
import { fromGlobal, toGlobal } from "./mapper/mapper";
89
import type { IMapping } from "./mapper/mapper.types";
910

@@ -306,6 +307,15 @@ export class Web3Adapter {
306307
if (!this.mapping[tableName]) return;
307308
console.log("We get here?");
308309
// If we already have a mapping, use that global ID
310+
311+
logger.info({
312+
message: "Handling change",
313+
dataId: data.id,
314+
tableName,
315+
existingGlobalId,
316+
participants,
317+
});
318+
309319
if (existingGlobalId) {
310320
if (this.lockedIds.includes(existingGlobalId)) return;
311321
const global = await toGlobal({
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from "./transport";
2+
export * from "./logger";
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import pino from "pino";
2+
import { transport } from "./transport";
3+
4+
export const logger = pino(transport);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { transport as pinoTransport } from "pino";
2+
import type { LokiOptions } from "pino-loki";
3+
4+
export const transport = pinoTransport<LokiOptions>({
5+
target: "pino-loki",
6+
options: {
7+
host: process.env.LOKI_URL || "http://localhost:3100",
8+
labels: {
9+
app: "web3-adapter",
10+
},
11+
basicAuth: {
12+
username: process.env.LOKI_USERNAME || "admin",
13+
password: process.env.LOKI_PASSWORD || "admin",
14+
},
15+
},
16+
});

platforms/pictique-api/src/database/data-source.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { PostgresSubscriber } from "../web3adapter/watchers/subscriber";
1212

1313
config({ path: path.resolve(__dirname, "../../../../.env") });
1414

15+
console.log("SAODIHUOPIFHDSA", process.env.PICTIQUE_DATABASE_URL)
1516
export const AppDataSource = new DataSource({
1617
type: "postgres",
1718
url: process.env.PICTIQUE_DATABASE_URL,

platforms/pictique-api/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { adapter } from "./web3adapter/watchers/subscriber";
1616
config({ path: path.resolve(__dirname, "../../../.env") });
1717

1818
const app = express();
19-
const port = process.env.PORT || 3000;
19+
const port = process.env.PORT || 1111;
2020

2121
// Initialize database connection and adapter
2222
AppDataSource.initialize()

0 commit comments

Comments
 (0)