--- parser3/src/main/pa_sql_driver_manager.C	2001/10/29 10:06:36	1.44
+++ parser3/src/main/pa_sql_driver_manager.C	2001/11/05 11:46:28	1.50
@@ -2,9 +2,9 @@
 	Parser: sql driver manager implementation.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: pa_sql_driver_manager.C,v 1.44 2001/10/29 10:06:36 paf Exp $
+	$Id: pa_sql_driver_manager.C,v 1.50 2001/11/05 11:46:28 paf Exp $
 */
 
 #include "pa_sql_driver_manager.h"
@@ -14,6 +14,8 @@
 #include "pa_common.h"
 #include "pa_threads.h"
 #include "pa_stack.h"
+#include "pa_vhash.h"
+#include "pa_vtable.h"
 
 // globals
 
@@ -24,6 +26,18 @@ SQL_Driver_manager *SQL_driver_manager;
 const int EXPIRE_UNUSED_CONNECTION_SECONDS=60;
 const int CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2;
 
+// helpers
+
+const String& url_without_login(Pool& pool, const String& url) {
+	String& result=*new(pool) String(pool);
+	result << url.mid(0, url.pos(":")) << "://****";
+
+	int at_pos=url.pos("@");
+	if(at_pos>0)
+		result << url.mid(at_pos, url.size());
+
+	return result;
+}
 
 /// SQL_Driver_services Pooled implementation
 class SQL_Driver_services_impl : public SQL_Driver_services, public Pooled {
@@ -32,7 +46,7 @@ public:
 		furl(aurl) {
 	}
 
-	virtual void *malloc(size_t size) { return Pooled::malloc(size); }
+	virtual void *malloc(size_t size) { return Pooled::malloc(size, 8); }
 	virtual void *calloc(size_t size) { return Pooled::calloc(size); }
 
 	/**
@@ -41,8 +55,9 @@ public:
 		and from there... #2 propagate_exception()
 	*/
 	virtual void _throw(const char *comment) { 
+		// hiding passwords and addresses from accidental show [imagine user forgot @exception]
 		e=Exception(0, 0, 
-			&furl, 
+			&url_without_login(pool(), furl),
 			comment); 
 
 		longjmp(mark, 1);
@@ -73,11 +88,12 @@ static void expire_connections(const Has
 
 // SQL_Driver_manager
 
-SQL_Driver_manager::SQL_Driver_manager(Pool& pool) : Pooled(pool),
-		driver_cache(pool),
-		connection_cache(pool),
+SQL_Driver_manager::SQL_Driver_manager(Pool& apool) : Pooled(apool),
+		driver_cache(apool),
+		connection_cache(apool),
 		prev_expiration_pass_time(0) {
-	
+
+	status_providers->put(*NEW String(pool(), "sql"), this);
 }
 
 SQL_Driver_manager::~SQL_Driver_manager() {
@@ -121,7 +137,7 @@ SQL_Connection& SQL_Driver_manager::get_
 				"connection string must start with protocol://"); // NOTE: not THROW, but PTHROW
 
 		// make global_url C-string on global pool
-		request_url_cstr=request_url.cstr(String::UL_AS_IS);
+		request_url_cstr=request_url.cstr();
 		char *global_url_cstr=(char *)malloc(strlen(request_url_cstr)+1);
 		strcpy(global_url_cstr, request_url_cstr);
 		// make global_url string on global pool
@@ -281,3 +297,50 @@ void SQL_Driver_manager::maybe_expire_co
 		prev_expiration_pass_time=now;
 	}
 }
+
+static void add_connection_to_status_cache_table(Array::Item *value, void *info) {
+	SQL_Connection& connection=*static_cast<SQL_Connection *>(value);
+	Table& table=*static_cast<Table *>(info);
+
+	if(connection.connected()) {
+		Pool& pool=table.pool();
+		Array& row=*new(pool) Array(pool);
+
+		// url
+		row+=&url_without_login(pool, connection.get_url());
+		// time
+		time_t time_stamp=connection.get_time_stamp();
+		const char *unsafe_time_cstr=ctime(&time_stamp);
+		int time_buf_size=strlen(unsafe_time_cstr);
+		char *safe_time_buf=(char *)pool.malloc(time_buf_size);
+		memcpy(safe_time_buf, unsafe_time_cstr, time_buf_size);
+		row+=new(pool) String(pool, safe_time_buf, time_buf_size);
+
+		table+=&row;
+	}
+}
+static void add_connections_to_status_cache_table(const Hash::Key& key, Hash::Val *value, void *info) {
+	Stack& stack=*static_cast<Stack *>(value);
+	Array_iter iter(stack);
+	for(int countdown=stack.top_index(); countdown-->=0; )
+		add_connection_to_status_cache_table(iter.next(), info);
+}
+
+
+Value& SQL_Driver_manager::get_status(Pool& pool, const String *source) {
+	VHash& result=*new(pool) VHash(pool);
+	
+	// cache
+	{
+		Array& columns=*new(pool) Array(pool);
+		columns+=new(pool) String(pool, "url");
+		columns+=new(pool) String(pool, "time");
+		Table& table=*new(pool) Table(pool, 0, &columns, connection_cache.size());
+
+		connection_cache.for_each(add_connections_to_status_cache_table, &table);
+
+		result.hash(source).put(*new(pool) String(pool, "cache"), new(pool) VTable(pool, &table));
+	}
+
+	return result;
+}
\ No newline at end of file