From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Subject: [PATCH] worker: remove old tmp accessor
Date: Sat, 1 Nov 2014 23:59:32 +0000 [thread overview]
Message-ID: <20141101235932.GA11560@dcvr.yhbt.net> (raw)
This has not been used since unicorn 4.0.0 over three years ago.
This is an incompatible change, but hopefully nobody uses this in
before_fork/after_fork hooks anywhere.
---
I really hope nobody is reaching into internals like this...
lib/unicorn/worker.rb | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/lib/unicorn/worker.rb b/lib/unicorn/worker.rb
index e74a1c9..b3f8afe 100644
--- a/lib/unicorn/worker.rb
+++ b/lib/unicorn/worker.rb
@@ -11,7 +11,6 @@ require "raindrops"
class Unicorn::Worker
# :stopdoc:
attr_accessor :nr, :switched
- attr_writer :tmp
attr_reader :to_io # IO.select-compatible
PER_DROP = Raindrops::PAGE_SIZE / Raindrops::SIZE
@@ -23,7 +22,7 @@ class Unicorn::Worker
@offset = nr % PER_DROP
@raindrop[@offset] = 0
@nr = nr
- @tmp = @switched = false
+ @switched = false
@to_io, @master = Unicorn.pipe
end
@@ -101,18 +100,8 @@ class Unicorn::Worker
@raindrop[@offset]
end
- # only exists for compatibility
- def tmp # :nodoc:
- @tmp ||= begin
- tmp = Unicorn::TmpIO.new
- tmp.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
- tmp
- end
- end
-
# called in both the master (reaping worker) and worker (SIGQUIT handler)
def close # :nodoc:
- @tmp.close if @tmp
@master.close if @master
@to_io.close if @to_io
end
@@ -141,7 +130,6 @@ class Unicorn::Worker
uid = Etc.getpwnam(user).uid
gid = Etc.getgrnam(group).gid if group
Unicorn::Util.chown_logs(uid, gid)
- @tmp.chown(uid, gid) if @tmp
if gid && Process.egid != gid
Process.initgroups(user, gid)
Process::GID.change_privilege(gid)
--
EW
reply other threads:[~2014-11-01 23:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141101235932.GA11560@dcvr.yhbt.net \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/unicorn.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).