Fossil SCM
Fixes to tracing.
Commit
0de3d907870640ec653b5945b9b03f1667f8472cb38128edf99a15d97416ccd8
Parent
119f97133522f66…
1 file changed
+6
-6
M
src/db.c
+6
-6
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1715,11 +1715,11 @@ | ||
| 1715 | 1715 | */ |
| 1716 | 1716 | void db_set_see_key_page(void){ |
| 1717 | 1717 | Blob key; |
| 1718 | 1718 | const char *zKey; |
| 1719 | 1719 | if( db_have_saved_encryption_key() ){ |
| 1720 | - fossil_errorlog("SEE: encryption key was already set\n"); | |
| 1720 | + fossil_trace("SEE: encryption key was already set\n"); | |
| 1721 | 1721 | return; |
| 1722 | 1722 | } |
| 1723 | 1723 | zKey = P("key"); |
| 1724 | 1724 | blob_init(&key, 0, 0); |
| 1725 | 1725 | if( zKey!=0 ){ |
| @@ -1727,14 +1727,14 @@ | ||
| 1727 | 1727 | blob_set(&key, zKey); |
| 1728 | 1728 | db_set_saved_encryption_key(&key); |
| 1729 | 1729 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1730 | 1730 | SEE_KEY_WRITE |
| 1731 | 1731 | ); |
| 1732 | - fossil_errorlog("SEE: set encryption key for process %lu, length %u\n", | |
| 1733 | - (unsigned long)processId, blob_size(&key)); | |
| 1732 | + fossil_trace("SEE: set encryption key for process %lu, length %u\n", | |
| 1733 | + (unsigned long)processId, blob_size(&key)); | |
| 1734 | 1734 | }else{ |
| 1735 | - fossil_errorlog("SEE: no encryption key specified\n"); | |
| 1735 | + fossil_trace("SEE: no encryption key specified\n"); | |
| 1736 | 1736 | } |
| 1737 | 1737 | blob_reset(&key); |
| 1738 | 1738 | } |
| 1739 | 1739 | |
| 1740 | 1740 | /* |
| @@ -1749,12 +1749,12 @@ | ||
| 1749 | 1749 | login_check_credentials(); |
| 1750 | 1750 | if( !g.perm.Setup ){ login_needed(0); return; } |
| 1751 | 1751 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1752 | 1752 | SEE_KEY_ZERO |
| 1753 | 1753 | ); |
| 1754 | - fossil_errorlog("SEE: unset encryption key for process %lu\n", | |
| 1755 | - (unsigned long)processId); | |
| 1754 | + fossil_trace("SEE: unset encryption key for process %lu\n", | |
| 1755 | + (unsigned long)processId); | |
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | /* |
| 1759 | 1759 | ** This function reads the saved database encryption key from the |
| 1760 | 1760 | ** specified Fossil parent process. This is only necessary (or |
| 1761 | 1761 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1715,11 +1715,11 @@ | |
| 1715 | */ |
| 1716 | void db_set_see_key_page(void){ |
| 1717 | Blob key; |
| 1718 | const char *zKey; |
| 1719 | if( db_have_saved_encryption_key() ){ |
| 1720 | fossil_errorlog("SEE: encryption key was already set\n"); |
| 1721 | return; |
| 1722 | } |
| 1723 | zKey = P("key"); |
| 1724 | blob_init(&key, 0, 0); |
| 1725 | if( zKey!=0 ){ |
| @@ -1727,14 +1727,14 @@ | |
| 1727 | blob_set(&key, zKey); |
| 1728 | db_set_saved_encryption_key(&key); |
| 1729 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1730 | SEE_KEY_WRITE |
| 1731 | ); |
| 1732 | fossil_errorlog("SEE: set encryption key for process %lu, length %u\n", |
| 1733 | (unsigned long)processId, blob_size(&key)); |
| 1734 | }else{ |
| 1735 | fossil_errorlog("SEE: no encryption key specified\n"); |
| 1736 | } |
| 1737 | blob_reset(&key); |
| 1738 | } |
| 1739 | |
| 1740 | /* |
| @@ -1749,12 +1749,12 @@ | |
| 1749 | login_check_credentials(); |
| 1750 | if( !g.perm.Setup ){ login_needed(0); return; } |
| 1751 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1752 | SEE_KEY_ZERO |
| 1753 | ); |
| 1754 | fossil_errorlog("SEE: unset encryption key for process %lu\n", |
| 1755 | (unsigned long)processId); |
| 1756 | } |
| 1757 | |
| 1758 | /* |
| 1759 | ** This function reads the saved database encryption key from the |
| 1760 | ** specified Fossil parent process. This is only necessary (or |
| 1761 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1715,11 +1715,11 @@ | |
| 1715 | */ |
| 1716 | void db_set_see_key_page(void){ |
| 1717 | Blob key; |
| 1718 | const char *zKey; |
| 1719 | if( db_have_saved_encryption_key() ){ |
| 1720 | fossil_trace("SEE: encryption key was already set\n"); |
| 1721 | return; |
| 1722 | } |
| 1723 | zKey = P("key"); |
| 1724 | blob_init(&key, 0, 0); |
| 1725 | if( zKey!=0 ){ |
| @@ -1727,14 +1727,14 @@ | |
| 1727 | blob_set(&key, zKey); |
| 1728 | db_set_saved_encryption_key(&key); |
| 1729 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1730 | SEE_KEY_WRITE |
| 1731 | ); |
| 1732 | fossil_trace("SEE: set encryption key for process %lu, length %u\n", |
| 1733 | (unsigned long)processId, blob_size(&key)); |
| 1734 | }else{ |
| 1735 | fossil_trace("SEE: no encryption key specified\n"); |
| 1736 | } |
| 1737 | blob_reset(&key); |
| 1738 | } |
| 1739 | |
| 1740 | /* |
| @@ -1749,12 +1749,12 @@ | |
| 1749 | login_check_credentials(); |
| 1750 | if( !g.perm.Setup ){ login_needed(0); return; } |
| 1751 | processId = db_maybe_handle_saved_encryption_key_for_process( |
| 1752 | SEE_KEY_ZERO |
| 1753 | ); |
| 1754 | fossil_trace("SEE: unset encryption key for process %lu\n", |
| 1755 | (unsigned long)processId); |
| 1756 | } |
| 1757 | |
| 1758 | /* |
| 1759 | ** This function reads the saved database encryption key from the |
| 1760 | ** specified Fossil parent process. This is only necessary (or |
| 1761 |