Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add port 8081 for indexer #668

Merged
merged 1 commit into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ npm run dev -- --from-block=12345 # start indexing from the 12345th block
npm run dev -- --run-once # index and exit without watching for events
npm run dev -- --no-cache # disable cache
npm run dev -- --log-level=trace # set log level
npm run dev -- --port=8081 # start web service on a given port
```

## Running in production
Expand Down
29 changes: 26 additions & 3 deletions fly.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ kill_timeout = '5s'
PASSPORT_SCORER_ID=335

[processes]
indexer = 'npm start -- --indexer --http'
indexer = 'npm start -- --indexer --http --port=8081'
web = 'npm start -- --http --http-wait-for-sync=false'

[[mounts]]
Expand All @@ -36,15 +36,38 @@ kill_timeout = '5s'
auto_extend_size_limit = "100GB"
processes = ['indexer', 'web']

[http_service]
[http_service.indexer]
internal_port = 8081
force_https = true
auto_stop_machines = true
auto_start_machines = true
min_machines_running = 1
processes = ['indexer']

[http_service.indexer.concurrency]
type = 'requests'
hard_limit = 250
soft_limit = 200

[checks.indexer_http]
port = 8081
type = 'http'
interval = '15s'
timeout = '10s'
grace_period = '30s'
method = 'get'
path = '/api/v1/status'
processes = ['indexer']

[http_service.web]
internal_port = 8080
force_https = true
auto_stop_machines = true
auto_start_machines = true
min_machines_running = 2
processes = ['web']

[http_service.concurrency]
[http_service.web.concurrency]
type = 'requests'
hard_limit = 250
soft_limit = 200
Expand Down
85 changes: 49 additions & 36 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1839,6 +1839,44 @@ export type Config = {
};

export function getConfig(): Config {
const { values: args } = parseArgs({
options: {
"to-block": {
type: "string",
},
"from-block": {
type: "string",
},
"drop-db": {
type: "boolean",
},
"rm-cache": {
type: "boolean",
},
"log-level": {
type: "string",
},
"run-once": {
type: "boolean",
},
"no-cache": {
type: "boolean",
},
"http-wait-for-sync": {
type: "string",
},
http: {
type: "boolean",
},
indexer: {
type: "boolean",
},
port: {
type: "string",
},
},
});

const buildTag = z
.union([z.string(), z.null()])
.default(null)
Expand All @@ -1849,7 +1887,17 @@ export function getConfig(): Config {
.transform((value) => value === "true")
.parse(process.env.ENABLE_RESOURCE_MONITOR);

const apiHttpPort = z.coerce.number().parse(process.env.PORT);
const portSchema = z.number().int().nonnegative().max(65535);

const portOverride = z
.union([portSchema, z.undefined()])
.optional()
.parse(args["port"]);

const apiHttpPort =
portOverride !== undefined
? portOverride
: portSchema.parse(z.coerce.number().parse(process.env.PORT));

const pinoPretty = z
.enum(["true", "false"])
Expand Down Expand Up @@ -1890,41 +1938,6 @@ export function getConfig(): Config {
.default(path.join(storageDir, "cache"))
.parse(process.env.CACHE_DIR);

const { values: args } = parseArgs({
options: {
"to-block": {
type: "string",
},
"from-block": {
type: "string",
},
"drop-db": {
type: "boolean",
},
"rm-cache": {
type: "boolean",
},
"log-level": {
type: "string",
},
"run-once": {
type: "boolean",
},
"no-cache": {
type: "boolean",
},
"http-wait-for-sync": {
type: "string",
},
http: {
type: "boolean",
},
indexer: {
type: "boolean",
},
},
});

const chains = z
.string()
.or(z.literal("all"))
Expand Down