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.

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

Jump to bottom

Move socket path to env #2955

Merged
merged 6 commits into from
Jan 17, 2020
Merged

Move socket path to env #2955

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd58943
move socket path to env
maxaleks Jan 16, 2020
2a2789b
Update CHANGELOG.md
maxaleks Jan 16, 2020
253e439
fix tests
maxaleks Jan 16, 2020
5523508
allow to set "/"
maxaleks Jan 17, 2020
288a69a
fix linter errors
maxaleks Jan 17, 2020
b083b14
Merge branch 'master' into move-socket-path-to-env
vbaranov Jan 17, 2020
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [#2918](https://github.com/poanetwork/blockscout/pull/2918) - Add tokenID for tokentx API action explicitly

### Fixes
- [#2955](https://github.com/poanetwork/blockscout/pull/2955) - Move socket path to env
- [#2934](https://github.com/poanetwork/blockscout/pull/2934) - RSK release 1.2.0 breaking changes support
- [#2933](https://github.com/poanetwork/blockscout/pull/2933) - Get rid of deadlock in the query to address_current_token_balance table
- [#2932](https://github.com/poanetwork/blockscout/pull/2932) - fix duplicate websocket connection
Expand Down
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/js/socket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Socket } from 'phoenix'
import { locale } from './locale'

const socket = new Socket('/socket', { params: { locale: locale } })
const socket = new Socket((process.env.SOCKET_ROOT || '') + '/socket', { params: { locale: locale } })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maxaleks websocket should work fine (the same way when there is no ENV var) if to set export SOCKET_ROOT=/ but it doesn't work

socket.connect()

export default socket
Expand Down
6 changes: 5 additions & 1 deletion apps/block_scout_web/assets/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const { ContextReplacementPlugin } = require('webpack')
const glob = require('glob')
const webpack = require('webpack')

function transpileViewScript(file) {
return {
Expand Down Expand Up @@ -136,7 +137,10 @@ const appJs =
filename: '../css/[name].css'
}),
new CopyWebpackPlugin([{ from: 'static/', to: '../' }]),
new ContextReplacementPlugin(/moment[\/\\]locale$/, /en/)
new ContextReplacementPlugin(/moment[\/\\]locale$/, /en/),
new webpack.DefinePlugin({
'process.env.SOCKET_ROOT': JSON.stringify(process.env.SOCKET_ROOT)
})
]
}

Expand Down