pathman: check that module is in shared_preload_libraries

zilder · zilder · commit 7519ffbc1638 · 2016-06-27T14:44:45.000+03:00
diff --git a/contrib/pg_pathman/pg_pathman.c b/contrib/pg_pathman/pg_pathman.c
@@ -150,15 +150,13 @@ bms_print(Bitmapset *bms)
 void
 _PG_init(void)
 {
-#ifndef WIN32
-	if (IsUnderPostmaster)
+	if (!process_shared_preload_libraries_in_progress)
 	{
 		elog(ERROR, "Pathman module must be initialized in postmaster. "
 					"Put the following line to configuration file: "
 					"shared_preload_libraries='pg_pathman'");
 	        initialization_needed = false;
 	}
-#endif
 
 	/* Request additional shared resources */
 	RequestAddinShmemSpace(pathman_memsize());

Original file line number	Diff line number	Diff line change
`@@ -150,15 +150,13 @@ bms_print(Bitmapset *bms)`
`150`	`150`	`void`
`151`	`151`	`_PG_init(void)`
`152`	`152`	`{`
`153`		`-#ifndef WIN32`
`154`		`- if (IsUnderPostmaster)`
	`153`	`+ if (!process_shared_preload_libraries_in_progress)`
`155`	`154`	`{`
`156`	`155`	`elog(ERROR, "Pathman module must be initialized in postmaster. "`
`157`	`156`	`"Put the following line to configuration file: "`
`158`	`157`	`"shared_preload_libraries='pg_pathman'");`
`159`	`158`	`initialization_needed = false;`
`160`	`159`	`}`
`161`		`-#endif`
`162`	`160`
`163`	`161`	`/* Request additional shared resources */`
`164`	`162`	`RequestAddinShmemSpace(pathman_memsize());`