Page MenuHomePhabricator
Differential D5502

Revert "[native] Add JSI functions for creating/setting and fetching device ID"
AbandonedPublicDraft
Actions

Authored by inka on Oct 31 2022, 12:50 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 4:22 AM
Unknown Object (File)
Wed, Apr 9, 4:22 AM
Unknown Object (File)
Wed, Apr 9, 4:22 AM
Unknown Object (File)
Sat, Apr 5, 10:52 AM
Unknown Object (File)
Wed, Mar 26, 11:11 AM
Unknown Object (File)
Mar 15 2025, 9:31 PM
Unknown Object (File)
Feb 20 2025, 1:20 PM
Unknown Object (File)
Feb 13 2025, 4:05 AM
View All Files
Subscribers
• abosh

Details

Reviewers
ashoat
tomek
varun
atul
• jon
Summary

This reverts commit ee24602c5622165d427b0c5fd4276c6531393250.

Test Plan

The test is pushing to phabricator and seeing if CI fails

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

inka created this revision.Oct 31 2022, 12:50 AM
Herald added a reviewer: • jon. · View Herald TranscriptOct 31 2022, 12:50 AM
Herald added a subscriber: • abosh. · View Herald Transcript
Harbormaster returned this revision to the author for changes because remote builds failed.Oct 31 2022, 12:58 AM
Harbormaster failed remote builds in B13094: Diff 17980!
inka abandoned this revision.Nov 2 2022, 1:20 AM

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
3 lines
45 lines
_generated/
schema/
2 lines

Diff 17980

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/_generated/NativeModules.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/_generated/NativeModules.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/schema/CommCoreModuleSchema.js

Loading...