1919
2020import com .zaxxer .hikari .HikariConfig ;
2121import com .zaxxer .hikari .HikariDataSource ;
22- import io .supertokens .pluginInterface .exceptions .QuitProgramFromPluginException ;
22+ import io .supertokens .pluginInterface .exceptions .DbInitException ;
2323import io .supertokens .storage .postgresql .config .Config ;
2424import io .supertokens .storage .postgresql .config .PostgreSQLConfig ;
2525import io .supertokens .storage .postgresql .output .Logging ;
3333public class ConnectionPool extends ResourceDistributor .SingletonResource {
3434
3535 private static final String RESOURCE_KEY = "io.supertokens.storage.postgresql.ConnectionPool" ;
36- private static HikariDataSource hikariDataSource = null ;
36+ private HikariDataSource hikariDataSource ;
37+ private final Start start ;
3738
3839 private ConnectionPool (Start start ) {
39- if (!start .enabled ) {
40- throw new RuntimeException ("Connection to refused" ); // emulates exception thrown by Hikari
41- }
42-
43- if (ConnectionPool .hikariDataSource != null ) {
44- // This implies that it was already created before and that
45- // there is no need to create Hikari again.
40+ this .start = start ;
41+ }
4642
47- // If ConnectionPool.hikariDataSource == null, it implies that
48- // either the config file had changed somehow (which means the plugin JAR was reloaded, resulting in static
49- // variables to be set to null), or it means that this is the first time we are trying to connect to a db
50- // (applicable only for testing).
43+ private synchronized void initialiseHikariDataSource () throws SQLException {
44+ if (this .hikariDataSource != null ) {
5145 return ;
5246 }
47+ if (!start .enabled ) {
48+ throw new RuntimeException ("Connection to refused" ); // emulates exception thrown by Hikari
49+ }
5350
5451 HikariConfig config = new HikariConfig ();
5552 PostgreSQLConfig userConfig = Config .getConfig (start );
@@ -92,8 +89,12 @@ private ConnectionPool(Start start) {
9289 // SuperTokens
9390 // - Failed to validate connection org.mariadb.jdbc.MariaDbConnection@79af83ae (Connection.setNetworkTimeout
9491 // cannot be called on a closed connection). Possibly consider using a shorter maxLifetime value.
95- config .setPoolName ("SuperTokens" );
96- hikariDataSource = new HikariDataSource (config );
92+ config .setPoolName (start .getUserPoolId () + "~" + start .getConnectionPoolId ());
93+ try {
94+ hikariDataSource = new HikariDataSource (config );
95+ } catch (Exception e ) {
96+ throw new SQLException (e );
97+ }
9798 }
9899
99100 private static int getTimeToWaitToInit (Start start ) {
@@ -120,30 +121,41 @@ private static ConnectionPool getInstance(Start start) {
120121 return (ConnectionPool ) start .getResourceDistributor ().getResource (RESOURCE_KEY );
121122 }
122123
123- static void initPool (Start start ) {
124- if (getInstance (start ) != null ) {
124+ static boolean isAlreadyInitialised (Start start ) {
125+ return getInstance (start ) != null && getInstance (start ).hikariDataSource != null ;
126+ }
127+
128+ static void initPool (Start start , boolean shouldWait ) throws DbInitException {
129+ if (isAlreadyInitialised (start )) {
125130 return ;
126131 }
127132 if (Thread .currentThread () != start .mainThread ) {
128- throw new QuitProgramFromPluginException ("Should not come here" );
133+ throw new DbInitException ("Should not come here" );
129134 }
130135 Logging .info (start , "Setting up PostgreSQL connection pool." , true );
131136 boolean longMessagePrinted = false ;
132137 long maxTryTime = System .currentTimeMillis () + getTimeToWaitToInit (start );
133- String errorMessage = "Error connecting to PostgreSQL instance. Please make sure that PostgreSQL is running and that "
134- + "you have" + " specified the correct values for ('postgresql_host' and 'postgresql_port') or for "
135- + "'postgresql_connection_uri'" ;
138+ String errorMessage =
139+ "Error connecting to PostgreSQL instance. Please make sure that PostgreSQL is running and that "
140+ + "you have" +
141+ " specified the correct values for ('postgresql_host' and 'postgresql_port') or for "
142+ + "'postgresql_connection_uri'" ;
136143 try {
144+ ConnectionPool con = new ConnectionPool (start );
145+ start .getResourceDistributor ().setResource (RESOURCE_KEY , con );
137146 while (true ) {
138147 try {
139- start . getResourceDistributor (). setResource ( RESOURCE_KEY , new ConnectionPool ( start ) );
148+ con . initialiseHikariDataSource ( );
140149 break ;
141150 } catch (Exception e ) {
151+ if (!shouldWait ) {
152+ throw new DbInitException (e );
153+ }
142154 if (e .getMessage ().contains ("Connection to" ) && e .getMessage ().contains ("refused" )
143155 || e .getMessage ().contains ("the database system is starting up" )) {
144156 start .handleKillSignalForWhenItHappens ();
145157 if (System .currentTimeMillis () > maxTryTime ) {
146- throw new QuitProgramFromPluginException (errorMessage );
158+ throw new DbInitException (errorMessage );
147159 }
148160 if (!longMessagePrinted ) {
149161 longMessagePrinted = true ;
@@ -160,10 +172,10 @@ static void initPool(Start start) {
160172 }
161173 Thread .sleep (getRetryIntervalIfInitFails (start ));
162174 } catch (InterruptedException ex ) {
163- throw new QuitProgramFromPluginException (errorMessage );
175+ throw new DbInitException (errorMessage );
164176 }
165177 } else {
166- throw e ;
178+ throw new DbInitException ( e ) ;
167179 }
168180 }
169181 }
@@ -174,19 +186,28 @@ static void initPool(Start start) {
174186
175187 public static Connection getConnection (Start start ) throws SQLException {
176188 if (getInstance (start ) == null ) {
177- throw new QuitProgramFromPluginException ("Please call initPool before getConnection" );
189+ throw new IllegalStateException ("Please call initPool before getConnection" );
178190 }
179191 if (!start .enabled ) {
180192 throw new SQLException ("Storage layer disabled" );
181193 }
182- return ConnectionPool .hikariDataSource .getConnection ();
194+ if (getInstance (start ).hikariDataSource == null ) {
195+ getInstance (start ).initialiseHikariDataSource ();
196+ }
197+ return getInstance (start ).hikariDataSource .getConnection ();
183198 }
184199
185200 static void close (Start start ) {
186201 if (getInstance (start ) == null ) {
187202 return ;
188203 }
189- ConnectionPool .hikariDataSource .close ();
190- ConnectionPool .hikariDataSource = null ;
204+ if (getInstance (start ).hikariDataSource != null ) {
205+ try {
206+ getInstance (start ).hikariDataSource .close ();
207+ } finally {
208+ // we mark it as null so that next time it's being initialised, it will be initialised again
209+ getInstance (start ).hikariDataSource = null ;
210+ }
211+ }
191212 }
192213}
0 commit comments