more instructions in dashboard + log 1000 lines

sbellity · sbellity · commit d00f4de378c1 · 2017-03-21T09:15:57.000+01:00
diff --git a/server/sync-agent.js b/server/sync-agent.js
@@ -229,7 +229,7 @@ export default class SyncAgent {
       const user = {};
       processed += 1;
 
-      if (processed % 100 === 0) {
+      if (processed % 1000 === 0) {
         const elapsed = new Date() - started_sync_at;
         this.hull.logger.info("sync.progress", { processed, elapsed });
         if (this.job) {
diff --git a/views/connected.html b/views/connected.html
@@ -34,11 +34,30 @@ <h4 class="mt-0 text-muted">SQL Query</h4>
               <textarea name="" rows="15" id="querying" class="form-control"><%= query %></textarea>
 
               <div class="pt-1 pb-1 text-muted">
-                <p>You can run incremental queries based on the date of the last sync. <br />The query will be rewritten to replace <code>:last_updated_at</code> with the date of the last successful sync operation.</p>
-                <br />
-                <p>For example to import entries from a <code>users</code> table with a date column named <code>updated_at</code>, you can write :</p>
-                <code>SELECT id as external_id, email as email FROM users WHERE updated_at >= :last_updated_at</code>
-                <hr />
+                <h6>How to write queries</h6>
+                <p>
+                  Valid queries MUST expose an `external_id` column or an `email` column. Lines with no `external_id` or `email` will be ignored.
+                  <br />
+                  All other fields will be imported as traits on the matching users.
+                  <br />
+                  For example, the following query will map the column `users.id` to your Hull users' `external_id`.
+                  <pre><code>
+                    SELECT user_id as external_id, plan_name, monthly_amount FROM users_subscriptions
+                  </code></pre>
+                </p>
+                <h6>Using incremental queries</h6>
+                <p>
+                  You can run incremental queries based on the date of the last sync.
+                  <br />
+                  The query will be rewritten to replace <code>:last_updated_at</code> with the date of the last successful sync operation.
+                  <br /><br />
+                  For example to import entries from a <code>users</code> table with a date column named <code>updated_at</code>, you can write :
+                  <pre><code>
+                    SELECT id as external_id, email as email, firstname as first_name
+                    FROM users
+                    WHERE updated_at >= :last_updated_at
+                  </code></pre>
+                </p>
               </div>
 
               <div class="pt-1 pb-1">
