Skip to content

Commit 27d0cc7

Browse files
committed
Merge branch 'main' into pool-centric
2 parents 8f19c58 + 010feac commit 27d0cc7

File tree

8 files changed

+72
-26
lines changed

8 files changed

+72
-26
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ And please give some love to our featured sponsors 🤩:
3232
<table><tr>
3333
<td align="center"><a href="https://www.the-guild.dev/"><img src="https://graphile.org/images/sponsors/theguild.png" width="90" height="90" alt="The Guild" /><br />The Guild</a> *</td>
3434
<td align="center"><a href="https://dovetailapp.com/"><img src="https://graphile.org/images/sponsors/dovetail.png" width="90" height="90" alt="Dovetail" /><br />Dovetail</a> *</td>
35-
<td align="center"><a href="https://www.netflix.com/"><img src="https://graphile.org/images/sponsors/Netflix.png" width="90" height="90" alt="Netflix" /><br />Netflix</a> *</td>
3635
<td align="center"><a href="https://stellate.co/"><img src="https://graphile.org/images/sponsors/Stellate.png" width="90" height="90" alt="Stellate" /><br />Stellate</a> *</td>
37-
</tr><tr>
3836
<td align="center"><a href="https://gosteelhead.com/"><img src="https://graphile.org/images/sponsors/steelhead.svg" width="90" height="90" alt="Steelhead" /><br />Steelhead</a> *</td>
39-
<td align="center"><a href="https://www.sylvera.com/"><img src="https://graphile.org/images/sponsors/sylvera.svg" width="90" height="90" alt="Sylvera" /><br />Sylvera</a> *</td>
37+
</tr><tr>
4038
<td align="center"><a href=""><img src="https://graphile.org/images/sponsors/triggerdev.png" width="90" height="90" alt="Trigger.dev" /><br />Trigger.dev</a></td>
4139
</tr></table>
4240

RELEASE_NOTES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Read more:
2727
using it!
2828
- Fixes bug where CLI defaults override `graphile.config.js` settings (by
2929
removing CLI defaults)
30+
- Fix bug where executable tasks had their stdout/stderr ignored; this is now
31+
output via logging (thanks @wineTGH).
3032

3133
## v0.16.6
3234

SPONSORS.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ Graphile ecosystem. Find out
88

99
- The Guild
1010
- Dovetail
11-
- Netflix
1211
- Stellate
1312
- Steelhead
14-
- Sylvera
1513
- Trigger.dev
1614

1715
## Leaders
1816

19-
- Qwick
20-
- Joe Dennis
2117
- Robert Claypool
2218
- Principia Mentis
2319
- Luxor Labs
@@ -34,25 +30,22 @@ Graphile ecosystem. Find out
3430
- Ndustrial
3531
- Beacon
3632
- deliver.media
33+
- Seam
3734
- Upowr
35+
- Ravio
36+
- OpenPipe
3837

3938
## Supporters
4039

4140
- HR-ON
4241
- stlbucket
43-
- Sam Levin
44-
- svarmony
45-
- James Rascoe
4642
- Simon Elliott
4743
- Matt Bretl
48-
- Daniel Einspanjer
49-
- Mansoor Razzaq
5044
- Keith Layne
5145
- Paul Melnikow
5246
- Alvin Ali Khaled
5347
- nullachtvierzehn
5448
- Zymego
55-
- Benjamin Berman
5649
- IFCHOR GROUP
5750
- Nate Smith
5851
- garpulon
@@ -65,5 +58,9 @@ Graphile ecosystem. Find out
6558
- Peter C. Romano
6659
- mateo
6760
- Gus Becciu
68-
- kontakto-fi
6961
- Dialo
62+
- Tailos, Inc.
63+
- sheilamosaik
64+
- kontakto-fi
65+
- Miguel O. Carvajal
66+
- Jovi De Croock

src/migrate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export async function installSchema(
3434
(event as Writeable<GraphileWorker.MigrateEvent>).postgresVersion =
3535
await fetchAndCheckPostgresVersion(event.client);
3636
await hooks.process("prebootstrap", event);
37-
37+
// Change to this query should be reflected in website/docs/schema.md
3838
await event.client.query(`
3939
create schema if not exists ${escapedWorkerSchema};
4040
create table if not exists ${escapedWorkerSchema}.migrations(

src/plugins/LoadTaskFromExecutableFilePlugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ function makeTaskForExecutable(taskIdentifier: string, fullPath: string): Task {
8787
child.once("error", (error) => {
8888
reject(error);
8989
});
90-
child.on("stdout", (data) => {
90+
child.stdout.on("data", (data) => {
9191
helpers.logger.info(data.toString("utf8"));
9292
});
93-
child.on("stderr", (data) => {
93+
child.stderr.on("data", (data) => {
9494
helpers.logger.error(data.toString("utf8"));
9595
});
9696
child.once("close", (code) => {

website/docs/pro/index.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,37 @@ at least 18 months after the launch offer ends.
3333
Worker Pro is currently in sponsors-only early access; any
3434
[sponsor](https://github.com/sponsors/benjie) on ~~$100/mo~~ $25+/mo may request
3535
access from @jemgillam or @benjie via the Discord, or email `team` at the domain
36-
`graphile.com`. Access to Worker Pro grants access to the GitHub Packages module
37-
and
36+
`graphile.com`.
37+
38+
The module is stored on and access is managed through GitHub Packages. We will
39+
need to know the GitHub username(s) of the person(s) that will need access so
40+
that we can add them to the repository. We strongly recommend that you also send
41+
us the GitHub username of a GitHub "service account" (see below) that you can
42+
use to generate an access token which can be shared across your various
43+
environments.
44+
45+
The usernames will be added to a team within the https://github.com/graphile-pro
46+
organization. This will grant access to the GitHub Packages module and
3847
[the source code repository on GitHub](https://github.com/graphile-pro/worker),
3948
including the ability to
4049
[file issues](https://github.com/graphile-pro/worker/issues/new) and open
41-
discussions about Worker Pro.
50+
discussions about Worker Pro. Though the repositories are currently private, any
51+
content posted to them via issues, discussions, PRs or otherwise may be made
52+
public in future, so post accordingly.
53+
54+
### Service account
55+
56+
Access to GitHub Packages requires a (highly restricted) security token. Despite
57+
the very limited scope of these tokens, using your own security credentials for
58+
shared systems (production, staging, development) isn't ideal; we therefore
59+
suggest that you create (if you haven't already) a separate GitHub user account
60+
that is granted minimal privileges, and this account can be used to generate a
61+
token that can be shared between the team and production environments. The
62+
service account you create on GitHub likely doesn't even need access to your
63+
source code.
64+
65+
Send us the username of the service account and we can invite it to the
66+
https://github.com/graphile-pro organization.
4267

4368
### Source available
4469

website/docs/schema.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,27 @@ schema in which you can store additional details.
5858
row from your task code. This is particularly useful to keep the end user
5959
abreast of the progress of their various background jobs, but is also useful
6060
for tracking completed jobs (which Graphile Worker will delete on success).
61+
62+
## Using a PostgreSQL user with restricted rights
63+
64+
Graphile Worker expects to execute as the database owner (not superuser) role.
65+
If you want to use a PostgreSQL user with limited permissions instead, you will
66+
need to make some adjustments.
67+
68+
For example, if you want to create the `graphile_worker` schema yourself then
69+
you can follow the technique described in
70+
[issue #132](https://github.com/graphile/worker/issues/132) to avoid errors
71+
about the worker role missing the privileges required to create the
72+
`graphile_worker` schema. Worker determines whether to create the schema or not
73+
based on whether or not the migrations table in the schema exists, so by
74+
creating the migrations table in addition to the `graphile_worker` schema Worker
75+
should be able to move on to the next step without raising an error.
76+
77+
```sql
78+
create schema graphile_worker;
79+
create table graphile_worker.migrations (
80+
id int primary key,
81+
ts timestamptz default now() not null,
82+
breaking bool default false not null
83+
);
84+
```

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12245,14 +12245,14 @@ write-file-atomic@^3.0.0:
1224512245
typedarray-to-buffer "^3.1.5"
1224612246

1224712247
ws@^7.3.1, ws@^7.4.6:
12248-
version "7.5.9"
12249-
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
12250-
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
12248+
version "7.5.10"
12249+
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
12250+
integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
1225112251

1225212252
ws@^8.13.0:
12253-
version "8.14.2"
12254-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
12255-
integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
12253+
version "8.17.1"
12254+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
12255+
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
1225612256

1225712257
xdg-basedir@^4.0.0:
1225812258
version "4.0.0"

0 commit comments

Comments
 (0)