adalal/gotenberg
1
0
Fork 0
mirror of https://github.com/gotenberg/gotenberg.git synced 2026-08-17 20:52:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-Authored-By: Julien Neuhart <j.neuhart@thecodingmachine.com>
This commit is contained in:
Thomas Bøgh Fangel
2019-06-17 11:29:52 +02:00
committed by GitHub
parent c36c7144cb
commit 6fa48c9222
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/base/Dockerfile
View File

@@ -92,6 +92,13 @@ RUN apt-get install -y \
COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf COPY build/base/fonts.conf /etc/fonts/conf.d/100-gotenberg.conf
# |--------------------------------------------------------------------------
# | Default user
# |--------------------------------------------------------------------------
# |
# | TODO find a correct description for why we're doing this.
# |
RUN groupadd --gid 1001 gotenberg \ RUN groupadd --gid 1001 gotenberg \
&& useradd --uid 1001 --gid gotenberg --shell /bin/bash --no-create-home gotenberg \ && useradd --uid 1001 --gid gotenberg --shell /bin/bash --no-create-home gotenberg \
&& mkdir /gotenberg \ && mkdir /gotenberg \

6
internal/pkg/pm2/chrome.go
View File

@@ -66,15 +66,15 @@ func (p *chrome) viable() bool {
'http://localhost:9222/json/version'`, p.name()) 'http://localhost:9222/json/version'`, p.name())
v, err := devtool.New("http://localhost:9222").Version(ctx) v, err := devtool.New("http://localhost:9222").Version(ctx)
if err != nil { if err != nil {
p.manager.notifyf("%v: Chrome version endpoint returned error: %v", p.name(), err) p.manager.notifyf("%s: %s version endpoint returned error: %v", p.name(), p.Fullname(), err)
return false return false
} }
p.manager.notifyf("%v: Chrome returned version info: %+v", p.name(), *v) p.manager.notifyf("%s: %s returned version info: %+v", p.name(), p.Fullname(), *v)
return true return true
} }
func (p *chrome) warmup() { func (p *chrome) warmup() {
p.manager.notifyf("%v: allowing Chrome %v to startup", p.name(), warmupTime) p.manager.notifyf("%s: allowing %s %v to startup", p.name(), p.Fullname(), warmupTime)
time.Sleep(warmupTime) time.Sleep(warmupTime)
} }

4
internal/pkg/pm2/pm2.go
View File

@@ -85,7 +85,7 @@ func (m *processManager) pm2(p Process, cmdName string) error {
) )
m.notifyf("executing command '%v'", strings.Join(cmd.Args, " ")) m.notifyf("executing command '%v'", strings.Join(cmd.Args, " "))
if m.verbose { if m.verbose {
chromeStdErr, err := cmd.StderrPipe() processStdErr, err := cmd.StderrPipe()
if err != nil { if err != nil {
return fmt.Errorf("failed getting Chrome stderr: %v", err) return fmt.Errorf("failed getting Chrome stderr: %v", err)
} }
@@ -95,7 +95,7 @@ func (m *processManager) pm2(p Process, cmdName string) error {
} }
readFromPipe := func(name string, reader io.ReadCloser) { readFromPipe := func(name string, reader io.ReadCloser) {
r := bufio.NewReader(reader) r := bufio.NewReader(reader)
defer reader.Close() defer reader.Close() // nolint: errcheck
for { for {
line, _, err := r.ReadLine() line, _, err := r.ReadLine()
if err != nil { if err != nil {