Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

add timestamp to saved logs, and zip on export

Browse source 
They're otherwise too big to email
This commit is contained in:
Eric House 2021-09-30 21:27:22 -07:00
parent afe030eabc
commit f083ba9897
1 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
View file

@ -34,8 +34,11 @@ import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Formatter; import java.util.Formatter;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.zip.GZIPOutputStream;
public class Log { public class Log {
private static final String TAG = Log.class.getSimpleName(); private static final String TAG = Log.class.getSimpleName();
@ -43,7 +46,7 @@ public class Log {
private static final String KEY_USE_DB = TAG + "/useDB"; private static final String KEY_USE_DB = TAG + "/useDB";
private static final boolean LOGGING_ENABLED = BuildConfig.NON_RELEASE; private static final boolean LOGGING_ENABLED = BuildConfig.NON_RELEASE;
private static final boolean ERROR_LOGGING_ENABLED = true; private static final boolean ERROR_LOGGING_ENABLED = true;
private static final String LOGS_FILE_NAME_FMT = BuildConfig.FLAVOR + "_logsDB_%d.txt"; private static final String LOGS_FILE_NAME_FMT = BuildConfig.FLAVOR + "_logsDB_%d.txt.gz";
private static final String LOGS_DB_NAME = "xwlogs_db"; private static final String LOGS_DB_NAME = "xwlogs_db";
private static final String LOGS_TABLE_NAME = "logs"; private static final String LOGS_TABLE_NAME = "logs";
private static final String COL_ENTRY = "entry"; private static final String COL_ENTRY = "entry";
@ -52,8 +55,9 @@ public class Log {
private static final String COL_ROWID = "rowid"; private static final String COL_ROWID = "rowid";
private static final String COL_TAG = "tag"; private static final String COL_TAG = "tag";
private static final String COL_LEVEL = "level"; private static final String COL_LEVEL = "level";
private static final String COL_TIMESTAMP = "ts";
private static final int DB_VERSION = 1; private static final int DB_VERSION = 2;
private static boolean sEnabled = BuildConfig.DEBUG; private static boolean sEnabled = BuildConfig.DEBUG;
private static boolean sUseDB; private static boolean sUseDB;
private static WeakReference<Context> sContextRef; private static WeakReference<Context> sContextRef;
@ -236,6 +240,7 @@ public class Log {
+ "," + COL_PID + " INTEGER" + "," + COL_PID + " INTEGER"
+ "," + COL_TAG + " TEXT" + "," + COL_TAG + " TEXT"
+ "," + COL_LEVEL + " INTEGER(2)" + "," + COL_LEVEL + " INTEGER(2)"
+ "," + COL_TIMESTAMP + " INTEGER"
+ ");"; + ");";
db.execSQL( query ); db.execSQL( query );
@ -245,9 +250,16 @@ public class Log {
@SuppressWarnings("fallthrough") @SuppressWarnings("fallthrough")
public void onUpgrade( SQLiteDatabase db, int oldVersion, int newVersion ) public void onUpgrade( SQLiteDatabase db, int oldVersion, int newVersion )
{ {
String msg = String.format("onUpgrade(%s): old: %d; new: %d", db, oldVersion, newVersion ); String msg = String.format("onUpgrade(%s): old: %d; new: %d", db,
oldVersion, newVersion );
android.util.Log.i( TAG, msg ); android.util.Log.i( TAG, msg );
Assert.failDbg(); switch ( oldVersion ) {
case 1:
addColumn( db, COL_TIMESTAMP, "INTEGER DEFAULT 0" );
break;
default:
Assert.failDbg();
}
} }
void store( LOG_LEVEL level, String tag, String msg ) void store( LOG_LEVEL level, String tag, String msg )
@ -261,6 +273,7 @@ public class Log {
values.put( COL_PID, pid ); values.put( COL_PID, pid );
values.put( COL_TAG, tag ); values.put( COL_TAG, tag );
values.put( COL_LEVEL, level.ordinal() ); values.put( COL_LEVEL, level.ordinal() );
values.put( COL_TIMESTAMP, System.currentTimeMillis() );
enqueue( new Runnable() { enqueue( new Runnable() {
@Override @Override
public void run() { public void run() {
@ -274,6 +287,8 @@ public class Log {
enqueue( new Runnable() { enqueue( new Runnable() {
@Override @Override
public void run() { public void run() {
SimpleDateFormat formatter = new SimpleDateFormat("yy/MM/dd HH:mm:ss.SSS");
File dir = Environment.getExternalStorageDirectory(); File dir = Environment.getExternalStorageDirectory();
dir = new File( dir, Environment.DIRECTORY_DOWNLOADS ); dir = new File( dir, Environment.DIRECTORY_DOWNLOADS );
File db; File db;
@ -285,27 +300,31 @@ public class Log {
} }
try { try {
OutputStream os = new FileOutputStream( db ); FileOutputStream fos = new FileOutputStream( db );
OutputStreamWriter osw = new OutputStreamWriter(os); GZIPOutputStream gzos = new GZIPOutputStream( fos );
OutputStreamWriter osw = new OutputStreamWriter( gzos );
String[] columns = { COL_ENTRY, COL_TAG, COL_THREAD, COL_PID }; String[] columns = { COL_ENTRY, COL_TAG, COL_THREAD, COL_PID,
COL_TIMESTAMP };
String selection = null; String selection = null;
String orderBy = COL_ROWID; String orderBy = COL_ROWID;
Cursor cursor = getReadableDatabase().query( LOGS_TABLE_NAME, columns, Cursor cursor = getReadableDatabase().query( LOGS_TABLE_NAME, columns,
selection, null, null, null, selection, null, null, null,
orderBy ); orderBy );
llog( "dumpToFile(): got %d results", cursor.getCount() ); llog( "dumpToFile(): got %d results", cursor.getCount() );
int indx0 = cursor.getColumnIndex( columns[0] ); int[] indices = new int[columns.length];
int indx1 = cursor.getColumnIndex( columns[1] ); for ( int ii = 0; ii < indices.length; ++ii ) {
int indx2 = cursor.getColumnIndex( columns[2] ); indices[ii] = cursor.getColumnIndex( columns[ii] );
int indx3 = cursor.getColumnIndex( columns[3] ); }
while ( cursor.moveToNext() ) { while ( cursor.moveToNext() ) {
String data = cursor.getString(indx0); String data = cursor.getString(indices[0]);
String tag = cursor.getString(indx1); String tag = cursor.getString(indices[1]);
int tid = cursor.getInt(indx2); int tid = cursor.getInt(indices[2]);
int pid = cursor.getInt(indx3); int pid = cursor.getInt(indices[3]);
long ts = cursor.getLong(indices[4]);
StringBuilder builder = new StringBuilder() StringBuilder builder = new StringBuilder()
.append(String.format("% 5d % 5d", pid, tid)).append(":") .append(formatter.format( new Date(ts) ))
.append(String.format(" % 5d % 5d", pid, tid)).append(":")
.append(tag).append(":") .append(tag).append(":")
.append(data).append("\n") .append(data).append("\n")
; ;
@ -336,6 +355,13 @@ public class Log {
} ); } );
} }
private void addColumn( SQLiteDatabase db, String colName, String colType )
{
String cmd = String.format( "ALTER TABLE %s ADD COLUMN %s %s;",
LOGS_TABLE_NAME, colName, colType );
db.execSQL( cmd );
}
private LinkedBlockingQueue<Runnable> mQueue; private LinkedBlockingQueue<Runnable> mQueue;
private void enqueue( Runnable runnable ) private void enqueue( Runnable runnable )
{ {