From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bofh@yhbt.net>
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no
	autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 2E78C1F55F;
	Sat, 30 Sep 2023 23:35:06 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yhbt.net;
	s=selector1; t=1696116906;
	bh=sNXjmdMxXgwqAk0XOxfIboNlQUF9ZfGzwt8oYgrphAA=;
	h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
	b=BfjQ2Wy5nP5xejRxFrk9KEZQnmIiaF4pORHbJSfUO3f4BNba+AepPJfO1hWO5+vB0
	 +Hm23aSmA5AWcOR3e2tA3ds9yOH0el+Zh93eJvvJUywwkVFnRslvIZQxlQsgxh8FIy
	 1jLxBRJYsWslyZi4ArDAvFyU2KGIWTBmsLC3bi7g=
Date: Sat, 30 Sep 2023 23:35:06 +0000
From: Eric Wong <bofh@yhbt.net>
To: Jean Boussier <jean.boussier@gmail.com>
Cc: raindrops-public@yhbt.net
Subject: [squash] make reusing inet_diag sock fork+preload safe
Message-ID: <20230930233506.M141715@dcvr>
References: <6E0E349D-A7CE-4B88-8F89-66438BB775A1@gmail.com>
 <20230926214000.M564322@dcvr>
 <20230930231320.M781709@dcvr>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230930231320.M781709@dcvr>
List-Id: <raindrops-public.yhbt.net>

I'll squash this in for fork+preload safety.
Fwiw, most of the stats stuff has never seen any real-world use
to my knowledge :x   Somebody else got me to work on it but never
got around to using it, so you're probably the only guinea pig :>

diff --git a/lib/raindrops/middleware.rb b/lib/raindrops/middleware.rb
index e0781f2..a9e2ee3 100644
--- a/lib/raindrops/middleware.rb
+++ b/lib/raindrops/middleware.rb
@@ -98,8 +98,6 @@ def initialize(app, opts = {})
       tmp = Unicorn.listener_names
     end
     @nl_sock = @tcp = @unix = nil
-    defined?(Raindrops::Linux.tcp_listener_stats) and
-      @nl_sock = Raindrops::InetDiagSocket.new
 
     if tmp
       @tcp = tmp.grep(/\A.+:\d+\z/)
@@ -131,6 +129,7 @@ def stats_response  # :nodoc:
            "writing: #{@stats.writing}\n"
 
     if defined?(Raindrops::Linux.tcp_listener_stats)
+      @nl_sock ||= Raindrops::InetDiagSocket.new
       Raindrops::Linux.tcp_listener_stats(@tcp, @nl_sock).each do |addr,stats|
         body << "#{addr} active: #{stats.active}\n" \
                 "#{addr} queued: #{stats.queued}\n"