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

v131 #258

Merged
merged 8 commits into from
Feb 12, 2018
Merged

v131 #258

Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Use Linux abstract socket for New Relic daemon communications
  • Loading branch information
dzuelke committed Feb 12, 2018
commit 8cf8199e3c93fcf69b71c3c8d5b6d5bb68d8b7a1
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

- Enable ext-sodium for PHP 7.2 on stack heroku-16 [David Zuelke]
- Composer/1.6.3 [David Zuelke]
- Use Linux abstract socket for New Relic daemon communications [David Zuelke]

## v130 (2018-01-11)

Expand Down
5 changes: 3 additions & 2 deletions support/build/extensions/no-debug-non-zts-20121212/newrelic
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if [[ -n "$NEW_RELIC_LICENSE_KEY" ]]; then
tail -qF -n 0 /tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log 1>&2 &

# daemon start
/app/.heroku/php/bin/newrelic-daemon --foreground --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" &
/app/.heroku/php/bin/newrelic-daemon --foreground --port "@newrelic-daemon" --logfile "/tmp/heroku.ext-newrelic.newrelic-daemon.${PORT}.log" --loglevel "${NEW_RELIC_LOG_LEVEL}" --pidfile "/tmp/newrelic-daemon.pid" &

# give it a moment to connect
sleep 2
Expand All @@ -84,7 +84,8 @@ mkdir -p ${OUT_PREFIX}/etc/php/conf.d
cat > ${OUT_PREFIX}/etc/php/conf.d/newrelic.ini-dist <<'EOF'
extension = newrelic.so

newrelic.daemon.location = /app/.heroku/php/bin/newrelic-daemon
newrelic.daemon.location = /app/.heroku/php/bin/newrelic-
newrelic.daemon.port = @newrelic-daemon

newrelic.loglevel = ${NEW_RELIC_LOG_LEVEL}
newrelic.daemon.loglevel = ${NEW_RELIC_LOG_LEVEL}
Expand Down