Skip to content

[mysql plugin] use --log-error instead of 2> #1733

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 18, 2024
Merged

[mysql plugin] use --log-error instead of 2> #1733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions examples/databases/mariadb/devbox.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"lockfile_version": "1",
"packages": {
"mariadb@latest": {
"last_modified": "2023-08-30T00:25:28Z",
"plugin_version": "0.0.1",
"resolved": "github:NixOS/nixpkgs/a63a64b593dcf2fe05f7c5d666eb395950f36bc9#mariadb_110",
"last_modified": "2024-01-14T03:55:27Z",
"plugin_version": "0.0.4",
"resolved": "github:NixOS/nixpkgs/dd5621df6dcb90122b50da5ec31c411a0de3e538#mariadb_110",
"source": "devbox-search",
"version": "11.0.3",
"version": "11.0.4",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/d5nb44vw8yy22lc21ld75nndmn9c3cgr-mariadb-server-11.0.3"
"store_path": "/nix/store/kslavfq486v9nsw6mkgxxk9njmvsi75n-mariadb-server-11.0.4"
},
"aarch64-linux": {
"store_path": "/nix/store/sz5n9bkcjxklk4jd0p5h26yi5j79wh7h-mariadb-server-11.0.3"
"store_path": "/nix/store/94v1z5jnk00flh0x7crhnkvkzbprh6r8-mariadb-server-11.0.4"
},
"x86_64-darwin": {
"store_path": "/nix/store/4l6h83flncplm3kmry1w08msyy7b7vdw-mariadb-server-11.0.3"
"store_path": "/nix/store/ykmll4wccnrw42nf4dric08g7axv60r1-mariadb-server-11.0.4"
},
"x86_64-linux": {
"store_path": "/nix/store/047g9nxp6jb2bqj1f53qk86sjzrscbmj-mariadb-server-11.0.3"
"store_path": "/nix/store/qx6dp64yxjazv7nkamiyy1vx9zji77k7-mariadb-server-11.0.4"
}
}
}
Expand Down
23 changes: 19 additions & 4 deletions examples/databases/mysql/devbox.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,25 @@
"lockfile_version": "1",
"packages": {
"mysql80@latest": {
"last_modified": "2023-06-29T16:20:38Z",
"plugin_version": "0.0.1",
"resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#mysql80",
"version": "8.0.33"
"last_modified": "2024-01-14T03:55:27Z",
"plugin_version": "0.0.3",
"resolved": "github:NixOS/nixpkgs/dd5621df6dcb90122b50da5ec31c411a0de3e538#mysql80",
"source": "devbox-search",
"version": "8.0.35",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/pimnmdghivjx1xbym1p0rcqqcr522pxd-mysql-8.0.35"
},
"aarch64-linux": {
"store_path": "/nix/store/w3c48ad6didigbvahxhcjyjjda0g01vh-mysql-8.0.35"
},
"x86_64-darwin": {
"store_path": "/nix/store/y4lza0lv90fggfrc5pak0q0i3x8jjav5-mysql-8.0.35"
},
"x86_64-linux": {
"store_path": "/nix/store/ca1q2q9h5k3hs8shivgmh9bfi51hw97p-mysql-8.0.35"
}
}
}
}
}
2 changes: 1 addition & 1 deletion plugins/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mariadb",
"version": "0.0.3",
"version": "0.0.4",
"readme": "* This plugin wraps mysqld and mysql_install_db to work in your local project\n* This plugin will create a new database for your project in MYSQL_DATADIR if one doesn't exist on shell init\n* Use mysqld to manually start the server, and `mysqladmin -u root shutdown` to manually stop it",
"env": {
"MYSQL_BASEDIR": "{{ .DevboxProfileDefault }}",
Expand Down
2 changes: 1 addition & 1 deletion plugins/mariadb/process-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "0.5"

processes:
mariadb:
command: "mysqld 2> $MYSQL_HOME/mysql.log & MYSQL_PID=$! && echo 'Starting mysqld... check mariadb_logs for details'"
command: "mysqld --log-error=$MYSQL_HOME/mysql.log & MYSQL_PID=$! && echo 'Starting mysqld... check mariadb_logs for details'"
is_daemon: true
shutdown:
command: "mysqladmin -u root shutdown"
Expand Down
2 changes: 1 addition & 1 deletion plugins/mysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mysql",
"version": "0.0.2",
"version": "0.0.3",
"readme": "* This plugin wraps mysqld and mysql_install_db to work in your local project\n* This plugin will create a new database for your project in MYSQL_DATADIR if one doesn't exist on shell init. This DB will be started in `insecure` mode, so be sure to add a root password after creation if needed.\n* Use mysqld to manually start the server, and `mysqladmin -u root shutdown` to manually stop it",
"env": {
"MYSQL_BASEDIR": "{{ .DevboxProfileDefault }}",
Expand Down
2 changes: 1 addition & 1 deletion plugins/mysql/process-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "0.5"

processes:
mysql:
command: "mysqld 2> $MYSQL_HOME/mysql.log & MYSQL_PID=$! && echo 'Starting mysqld... check mysql_logs for details'"
command: "mysqld --log-error=$MYSQL_HOME/mysql.log & MYSQL_PID=$! && echo 'Starting mysqld... check mysql_logs for details'"
is_daemon: true
shutdown:
command: "mysqladmin -u root shutdown"
Expand Down